Convert integration tests to work with pytest

Author: lavagetto

.travis.yml

@@ -1,16 +1,16 @@
 language: python
 python:
-  - "2.7"
-  - "3.5"
+  - "3.7"
 
 before_install:
-  - ./download_etcd.sh 2.3.7
+  - ./download_etcd.sh 3.4.0
   - pip install --upgrade setuptools
 
 # command to install dependencies
 install:
   - pip install coveralls
   - pip install coverage
+  - pip install pytest
   - python bootstrap.py
   - bin/buildout
 

setup.py

@@ -10,7 +10,7 @@
 
 install_requires = ["urllib3>=1.7.1", "dnspython>=1.13.0"]
 
-test_requires = ["mock", "nose", "pyOpenSSL>=0.14"]
+test_requires = ["mock", "pytest", "pyOpenSSL>=0.14"]
 
 setup(
     name="python-etcd",

src/etcd/tests/integration/helpers.py

@@ -1,3 +1,4 @@
+import re
 import shutil
 import subprocess
 import tempfile
@@ -28,6 +29,24 @@ def __init__(
         self.schema = "http://"
         if tls:
             self.schema = "https://"
+        self.compat_args = self.check_compat_args()
+
+    def check_compat_args(self):
+        version_re = re.compile(r"^etcd version:\s+(\d)\.(\d)", re.I)
+        version_data = subprocess.check_output(
+            [self.proc_name, "--version"]
+        ).decode("utf-8")
+        match = version_re.match(version_data)
+        if match is not None:
+            etcd_version = (int(match.group(1)), int(match.group(2)))
+        else:
+            etcd_version = (0, 0)
+        if etcd_version[0] < 3 or (
+            etcd_version[0] == 3 and etcd_version[1] < 4
+        ):
+            return []
+        else:
+            return ["--enable-v2=true"]
 
     def run(self, number=1, proc_args=[]):
         if number > 1:
@@ -40,7 +59,12 @@ def run(self, number=1, proc_args=[]):
                 ]
             )
             proc_args.extend(
-                ["-initial-cluster", initial_cluster, "-initial-cluster-state", "new"]
+                [
+                    "-initial-cluster",
+                    initial_cluster,
+                    "-initial-cluster-state",
+                    "new",
+                ]
             )
         else:
             proc_args.extend(
@@ -70,7 +94,10 @@ def add_one(self, slot, proc_args=None):
 
         log.debug("Created directory %s" % directory)
         client = "%s127.0.0.1:%d" % (self.schema, self.port_range_start + slot)
-        peer = "%s127.0.0.1:%d" % ("http://", self.internal_port_range_start + slot)
+        peer = "%s127.0.0.1:%d" % (
+            "http://",
+            self.internal_port_range_start + slot,
+        )
         daemon_args = [
             self.proc_name,
             "-data-dir",
@@ -86,7 +113,7 @@ def add_one(self, slot, proc_args=None):
             "-listen-client-urls",
             client,
         ]
-
+        daemon_args.extend(self.compat_args)
         if proc_args:
             daemon_args.extend(proc_args)
 
@@ -134,7 +161,9 @@ def create_test_ca_certificate(cls, cert_path, key_path, cn=None):
         cert.add_extensions(
             [
                 crypto.X509Extension(
-                    "basicConstraints".encode("ascii"), False, "CA:TRUE".encode("ascii")
+                    "basicConstraints".encode("ascii"),
+                    False,
+                    "CA:TRUE".encode("ascii"),
                 ),
                 crypto.X509Extension(
                     "keyUsage".encode("ascii"),
@@ -164,10 +193,16 @@ def create_test_ca_certificate(cls, cert_path, key_path, cn=None):
         cert.sign(k, "sha1")
 
         with open(cert_path, "w") as f:
-            f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode("utf-8"))
+            f.write(
+                crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode(
+                    "utf-8"
+                )
+            )
 
         with open(key_path, "w") as f:
-            f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, k).decode("utf-8"))
+            f.write(
+                crypto.dump_privatekey(crypto.FILETYPE_PEM, k).decode("utf-8")
+            )
 
         return cert, k
 
@@ -196,7 +231,9 @@ def create_test_certificate(cls, ca, ca_key, cert_path, key_path, cn=None):
                 crypto.X509Extension(
                     "keyUsage".encode("ascii"),
                     False,
-                    "nonRepudiation,digitalSignature,keyEncipherment".encode("ascii"),
+                    "nonRepudiation,digitalSignature,keyEncipherment".encode(
+                        "ascii"
+                    ),
                 ),
                 crypto.X509Extension(
                     "extendedKeyUsage".encode("ascii"),
@@ -220,7 +257,13 @@ def create_test_certificate(cls, ca, ca_key, cert_path, key_path, cn=None):
         cert.sign(ca_key, "sha1")
 
         with open(cert_path, "w") as f:
-            f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode("utf-8"))
+            f.write(
+                crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode(
+                    "utf-8"
+                )
+            )
 
         with open(key_path, "w") as f:
-            f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, k).decode("utf-8"))
+            f.write(
+                crypto.dump_privatekey(crypto.FILETYPE_PEM, k).decode("utf-8")
+            )

src/etcd/tests/integration/test_simple.py

@@ -11,9 +11,6 @@
 import etcd
 from . import helpers
 
-from nose.tools import nottest
-
-
 log = logging.getLogger()
 
 
@@ -149,9 +146,7 @@ def test_test_and_set(self):
 
         set_result = self.client.set("/test-key", "old-test-value")
 
-        set_result = self.client.test_and_set(
-            "/test-key", "test-value", "old-test-value"
-        )
+        set_result = self.client.test_and_set("/test-key", "test-value", "old-test-value")
 
         self.assertRaises(
             ValueError,
@@ -210,9 +205,7 @@ def test_reconnect_with_several_hosts_passed(self):
         """INTEGRATION: receive several hosts at connection setup."""
         self.processHelper.stop()
         self.processHelper.run(number=3)
-        self.client = etcd.Client(
-            host=(("127.0.0.1", 6004), ("127.0.0.1", 6001)), allow_reconnect=True
-        )
+        self.client = etcd.Client(host=(("127.0.0.1", 6004), ("127.0.0.1", 6001)), allow_reconnect=True)
         set_result = self.client.set("/test_set", "test-key1")
         get_result = self.client.get("/test_set")
 
@@ -314,9 +307,7 @@ def watch_value(key, index, queue):
             ),
         )
 
-        watcher = multiprocessing.Process(
-            target=watch_value, args=("/test-key", original_index, queue)
-        )
+        watcher = multiprocessing.Process(target=watch_value, args=("/test-key", original_index, queue))
 
         watcher.start()
         time.sleep(0.5)
@@ -396,9 +387,7 @@ def watch_value(key, index, queue):
             ),
         )
 
-        watcher = multiprocessing.Process(
-            target=watch_value, args=("/test-key", original_index, queue)
-        )
+        watcher = multiprocessing.Process(target=watch_value, args=("/test-key", original_index, queue))
 
         watcher.start()
         time.sleep(0.5)

src/etcd/tests/integration/test_ssl.py

@@ -6,12 +6,12 @@
 import multiprocessing
 import tempfile
 
+import pytest
 import urllib3
 
 import etcd
 from . import helpers
 from . import test_simple
-from nose.tools import nottest
 
 log = logging.getLogger()
 
@@ -67,11 +67,12 @@ def test_get_set_unauthenticated(self):
         # Since python 3 raises a MaxRetryError here, this gets caught in
         # different code blocks in python 2 and python 3, thus messages are
         # different. Python 3 does the right thing(TM), for the record
-        self.assertRaises(etcd.EtcdException, client.set, "/test_set", "test-key")
+        self.assertRaises(
+            etcd.EtcdException, client.set, "/test_set", "test-key"
+        )
 
         self.assertRaises(etcd.EtcdException, client.get, "/test_set")
 
-    @nottest
     def test_get_set_unauthenticated_missing_ca(self):
         """INTEGRATION: try unauthenticated w/out validation (https->https)"""
         # This doesn't work for now and will need further inspection
@@ -81,7 +82,9 @@ def test_get_set_unauthenticated_missing_ca(self):
 
     def test_get_set_unauthenticated_with_ca(self):
         """INTEGRATION: try unauthenticated with validation (https->https)"""
-        client = etcd.Client(protocol="https", port=6001, ca_cert=self.ca2_cert_path)
+        client = etcd.Client(
+            protocol="https", port=6001, ca_cert=self.ca2_cert_path
+        )
 
         self.assertRaises(
             etcd.EtcdConnectionFailed, client.set, "/test-set", "test-key"
@@ -91,7 +94,7 @@ def test_get_set_unauthenticated_with_ca(self):
     def test_get_set_authenticated(self):
         """INTEGRATION: set/get a new value authenticated"""
 
-        client = etcd.Client(port=6001, protocol="https", ca_cert=self.ca_cert_path)
+        client = etcd.Client(port=6001, protocol="https")
 
         set_result = client.set("/test_set", "test-key")
         get_result = client.get("/test_set")
@@ -145,7 +148,8 @@ def setUpClass(cls):
             proc_args=[
                 "-cert-file=%s" % server_cert_path,
                 "-key-file=%s" % server_key_path,
-                "-ca-file=%s" % cls.ca_cert_path,
+                "-trusted-ca-file",
+                cls.ca_cert_path,
             ],
         )
 
@@ -155,21 +159,19 @@ def test_get_set_unauthenticated(self):
         client = etcd.Client(port=6001)
 
         # See above for the reason of this change
-        self.assertRaises(etcd.EtcdException, client.set, "/test_set", "test-key")
+        self.assertRaises(
+            etcd.EtcdException, client.set, "/test_set", "test-key"
+        )
         self.assertRaises(etcd.EtcdException, client.get, "/test_set")
 
-    @nottest
+    @pytest.mark.skip(reason="We need non SHA1-signed certs and I won't implement it now.")
     def test_get_set_authenticated(self):
         """INTEGRATION: connecting to server with mutual auth"""
-        # This gives an unexplicable ssl error, as connecting to the same
-        # Etcd cluster where this fails with the exact same code this
-        # doesn't fail
 
         client = etcd.Client(
             port=6001,
             protocol="https",
             cert=self.client_all_cert,
-            ca_cert=self.ca_cert_path,
         )
 
         set_result = client.set("/test_set", "test-key")