Simplify test/unit/test_client.py::test_assert_version using pytest.warns and fix errors in previous commit

Author: ntninja

ipfshttpclient/client/__init__.py

@@ -7,6 +7,7 @@
 
 import os
 import typing as ty
+import warnings
 
 import multiaddr
 

test/functional/conftest.py

@@ -20,7 +20,7 @@ def is_available():  # noqa
 	if not isinstance(__is_available, bool):
 		try:
 			ipfshttpclient.connect()
-		except ipfshttpclient.exceptions.Error as error:
+		except ipfshttpclient.exceptions.Error:
 			__is_available = False
 		else:
 			__is_available = True

test/unit/test_client.py

@@ -1,52 +1,27 @@
-import warnings
-
 import pytest
 
 import ipfshttpclient
 
 
 def test_assert_version():
-	with warnings.catch_warnings(record=True) as w:
-		# Cause all warnings to always be triggered.
-		warnings.simplefilter("always")
-
+	with pytest.warns(None) as warnings:
 		# Minimum required version
 		ipfshttpclient.assert_version("0.1.0", "0.1.0", "0.2.0", ["0.1.2"])
 
-		assert len(w) == 0
+	assert len(warnings) == 0
 
 	# Too high version
-	with warnings.catch_warnings(record=True) as w:
-		# Cause all warnings to always be triggered.
-		warnings.simplefilter("always")
-
+	with pytest.warns(ipfshttpclient.exceptions.VersionMismatch):
 		ipfshttpclient.assert_version("0.2.0", "0.1.0", "0.2.0", ["0.1.2"])
 
-		assert len(w) == 1
-		assert issubclass(w[-1].category, ipfshttpclient.exceptions.VersionMismatch)
-
-
 	# Too low version
-	with warnings.catch_warnings(record=True) as w:
-		# Cause all warnings to always be triggered.
-		warnings.simplefilter("always")
-
+	with pytest.warns(ipfshttpclient.exceptions.VersionMismatch):
 		ipfshttpclient.assert_version("0.0.5", "0.1.0", "0.2.0", ["0.1.2"])
 
-		assert len(w) == 1
-		assert issubclass(w[-1].category, ipfshttpclient.exceptions.VersionMismatch)
-
-
 	# Blacklisted version
-	with warnings.catch_warnings(record=True) as w:
-		# Cause all warnings to always be triggered.
-		warnings.simplefilter("always")
-
+	with pytest.warns(ipfshttpclient.exceptions.VersionMismatch):
 		ipfshttpclient.assert_version("0.1.2-1", "0.1.0", "0.2.0", ["0.1.2"])
 
-		assert len(w) == 1
-		assert issubclass(w[-1].category, ipfshttpclient.exceptions.VersionMismatch)
-
 
 def test_client_session_param():
 	client = ipfshttpclient.Client(session=True)