diff options
Diffstat (limited to 'kazoo/tests/test_sasl.py')
| -rw-r--r-- | kazoo/tests/test_sasl.py | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/kazoo/tests/test_sasl.py b/kazoo/tests/test_sasl.py index 635b7c4..efdf965 100644 --- a/kazoo/tests/test_sasl.py +++ b/kazoo/tests/test_sasl.py @@ -2,7 +2,7 @@ import os import subprocess import time -from nose import SkipTest +import pytest from kazoo.testing import KazooTestHarness from kazoo.exceptions import ( @@ -17,7 +17,7 @@ class TestLegacySASLDigestAuthentication(KazooTestHarness): try: import puresasl # NOQA except ImportError: - raise SkipTest("PureSASL not available.") + pytest.skip("PureSASL not available.") os.environ["ZOOKEEPER_JAAS_AUTH"] = "digest" self.setup_zookeeper() @@ -27,7 +27,7 @@ class TestLegacySASLDigestAuthentication(KazooTestHarness): else: version = self.client.server_version() if not version or version < (3, 4): - raise SkipTest("Must use Zookeeper 3.4 or above") + pytest.skip("Must use Zookeeper 3.4 or above") def tearDown(self): self.teardown_zookeeper() @@ -48,7 +48,8 @@ class TestLegacySASLDigestAuthentication(KazooTestHarness): client.create("/1", acl=(acl,)) # give ZK a chance to copy data to other node time.sleep(0.1) - self.assertRaises(NoAuthError, self.client.get, "/1") + with pytest.raises(NoAuthError): + self.client.get("/1") finally: client.delete("/1") client.stop() @@ -56,7 +57,8 @@ class TestLegacySASLDigestAuthentication(KazooTestHarness): def test_invalid_sasl_auth(self): client = self._get_client(auth_data=[("sasl", "baduser:badpassword")]) - self.assertRaises(AuthFailedError, client.start) + with pytest.raises(AuthFailedError): + client.start() class TestSASLDigestAuthentication(KazooTestHarness): @@ -64,7 +66,7 @@ class TestSASLDigestAuthentication(KazooTestHarness): try: import puresasl # NOQA except ImportError: - raise SkipTest("PureSASL not available.") + pytest.skip("PureSASL not available.") os.environ["ZOOKEEPER_JAAS_AUTH"] = "digest" self.setup_zookeeper() @@ -74,7 +76,7 @@ class TestSASLDigestAuthentication(KazooTestHarness): else: version = self.client.server_version() if not version or version < (3, 4): - raise SkipTest("Must use Zookeeper 3.4 or above") + pytest.skip("Must use Zookeeper 3.4 or above") def tearDown(self): self.teardown_zookeeper() @@ -99,7 +101,8 @@ class TestSASLDigestAuthentication(KazooTestHarness): client.create("/1", acl=(acl,)) # give ZK a chance to copy data to other node time.sleep(0.1) - self.assertRaises(NoAuthError, self.client.get, "/1") + with pytest.raises(NoAuthError): + self.client.get("/1") finally: client.delete("/1") client.stop() @@ -113,7 +116,8 @@ class TestSASLDigestAuthentication(KazooTestHarness): "password": "badpassword", } ) - self.assertRaises(AuthFailedError, client.start) + with pytest.raises(AuthFailedError): + client.start() class TestSASLGSSAPIAuthentication(KazooTestHarness): @@ -121,13 +125,13 @@ class TestSASLGSSAPIAuthentication(KazooTestHarness): try: import puresasl # NOQA except ImportError: - raise SkipTest("PureSASL not available.") + pytest.skip("PureSASL not available.") try: import kerberos # NOQA except ImportError: - raise SkipTest("Kerberos support not available.") + pytest.skip("Kerberos support not available.") if not os.environ.get("KRB5_TEST_ENV"): - raise SkipTest("Test Kerberos environ not setup.") + pytest.skip("Test Kerberos environ not setup.") os.environ["ZOOKEEPER_JAAS_AUTH"] = "gssapi" self.setup_zookeeper() @@ -137,7 +141,7 @@ class TestSASLGSSAPIAuthentication(KazooTestHarness): else: version = self.client.server_version() if not version or version < (3, 4): - raise SkipTest("Must use Zookeeper 3.4 or above") + pytest.skip("Must use Zookeeper 3.4 or above") def tearDown(self): self.teardown_zookeeper() @@ -163,7 +167,8 @@ class TestSASLGSSAPIAuthentication(KazooTestHarness): client.create("/1", acl=(acl,)) # give ZK a chance to copy data to other node time.sleep(0.1) - self.assertRaises(NoAuthError, self.client.get, "/1") + with pytest.raises(NoAuthError): + self.client.get("/1") finally: client.delete("/1") client.stop() @@ -183,4 +188,5 @@ class TestSASLGSSAPIAuthentication(KazooTestHarness): ) client = self._get_client(sasl_options={"mechanism": "GSSAPI"}) - self.assertRaises(AuthFailedError, client.start) + with pytest.raises(AuthFailedError): + client.start() |