fix formatting for black for tests

Author: lavagetto

src/etcd/tests/integration/helpers.py

@@ -33,17 +33,13 @@ def __init__(
 
     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")
+        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
-        ):
+        if etcd_version[0] < 3 or (etcd_version[0] == 3 and etcd_version[1] < 4):
             return []
         else:
             return ["--enable-v2=true"]
@@ -70,9 +66,7 @@ def run(self, number=1, proc_args=[]):
             proc_args.extend(
                 [
                     "-initial-cluster",
-                    "test-node-0=http://127.0.0.1:{}".format(
-                        self.internal_port_range_start
-                    ),
+                    "test-node-0=http://127.0.0.1:{}".format(self.internal_port_range_start),
                     "-initial-cluster-state",
                     "new",
                 ]
@@ -88,9 +82,7 @@ def stop(self):
 
     def add_one(self, slot, proc_args=None):
         log = logging.getLogger()
-        directory = tempfile.mkdtemp(
-            dir=self.base_directory, prefix="python-etcd.%d-" % slot
-        )
+        directory = tempfile.mkdtemp(dir=self.base_directory, prefix="python-etcd.%d-" % slot)
 
         log.debug("Created directory %s" % directory)
         client = "%s127.0.0.1:%d" % (self.schema, self.port_range_start + slot)
@@ -193,16 +185,10 @@ 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
 
@@ -231,9 +217,7 @@ 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"),
@@ -257,13 +241,7 @@ 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

@@ -205,7 +205,9 @@ 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")
 
@@ -307,7 +309,9 @@ 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)
@@ -387,7 +391,9 @@ 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

@@ -67,9 +67,7 @@ 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")
 
@@ -82,13 +80,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"
-        )
+        self.assertRaises(etcd.EtcdConnectionFailed, client.set, "/test-set", "test-key")
         self.assertRaises(etcd.EtcdConnectionFailed, client.get, "/test-set")
 
     def test_get_set_authenticated(self):
@@ -117,9 +111,7 @@ def setUpClass(cls):
 
         cls.client_all_cert = os.path.join(cls.directory, "client-all.crt")
 
-        ca, ca_key = helpers.TestingCA.create_test_ca_certificate(
-            cls.ca_cert_path, ca_key_path
-        )
+        ca, ca_key = helpers.TestingCA.create_test_ca_certificate(cls.ca_cert_path, ca_key_path)
 
         helpers.TestingCA.create_test_certificate(
             ca, ca_key, server_cert_path, server_key_path, "127.0.0.1"
@@ -159,9 +151,7 @@ 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")
 
     @pytest.mark.skip(reason="We need non SHA1-signed certs and I won't implement it now.")

src/etcd/tests/test_auth.py

@@ -48,9 +48,7 @@ def test_read(self):
         self.assertEquals(u.roles, set(["root"]))
 
         # The user is correctly rendered out
-        self.assertEquals(
-            u._to_net(), [{"user": "root", "password": None, "roles": ["root"]}]
-        )
+        self.assertEquals(u._to_net(), [{"user": "root", "password": None, "roles": ["root"]}])
 
         # An inexistent user raises the appropriate exception
         u = auth.EtcdUser(self.client, "user.does.not.exist")

src/etcd/tests/unit/test_client.py

@@ -115,9 +115,7 @@ def test_set_username_password(self):
 
     def test_get_headers_with_auth(self):
         client = etcd.Client(username="username", password="password")
-        assert client._get_headers() == {
-            "authorization": "Basic dXNlcm5hbWU6cGFzc3dvcmQ="
-        }
+        assert client._get_headers() == {"authorization": "Basic dXNlcm5hbWU6cGFzc3dvcmQ="}
 
     def test__set_version_info(self):
         """Verify _set_version_info makes the proper call to the server"""
@@ -179,16 +177,12 @@ def test_discover(self):
                 method = dns.name.from_text
             r.target = method("etcd{}.example.com".format(i))
             answers.append(r)
-        dns.resolver.query = mock.create_autospec(
-            dns.resolver.query, return_value=answers
-        )
+        dns.resolver.query = mock.create_autospec(dns.resolver.query, return_value=answers)
         self.machines = etcd.Client.machines
         etcd.Client.machines = mock.create_autospec(
             etcd.Client.machines, return_value=["https://etcd2.example.com:2379"]
         )
-        c = etcd.Client(
-            srv_domain="example.com", allow_reconnect=True, protocol="https"
-        )
+        c = etcd.Client(srv_domain="example.com", allow_reconnect=True, protocol="https")
         etcd.Client.machines = self.machines
         self.assertEqual(c.host, "etcd1.example.com")
         self.assertEqual(c.port, 2379)

src/etcd/tests/unit/test_lock.py

@@ -149,7 +149,9 @@ def side_effect():
         }
         self._mock_api(200, d)
 
-        self.locker._get_locker = mock.create_autospec(self.locker._get_locker, side_effect=side_effect)
+        self.locker._get_locker = mock.create_autospec(
+            self.locker._get_locker, side_effect=side_effect
+        )
         self.assertTrue(self.locker._acquired())
 
     def test_lock_key(self):

src/etcd/tests/unit/test_old_request.py

@@ -98,7 +98,9 @@ def test_test_and_test_failure(self):
 
         client = etcd.Client()
         client.api_execute = mock.Mock(
-            side_effect=ValueError("The given PrevValue is not equal" " to the value of the key : TestAndSet: 1!=3")
+            side_effect=ValueError(
+                "The given PrevValue is not equal" " to the value of the key : TestAndSet: 1!=3"
+            )
         )
         try:
             result = client.test_and_set("/testkey", "newvalue", "test", ttl=19)
@@ -145,7 +147,11 @@ def test_get(self):
         client.api_execute = mock.Mock(
             return_value=FakeHTTPResponse(
                 200,
-                '{"action":"GET",' '"node": {' '"key":"/testkey",' '"value":"test",' '"modifiedIndex":190}}',
+                '{"action":"GET",'
+                '"node": {'
+                '"key":"/testkey",'
+                '"value":"test",'
+                '"modifiedIndex":190}}',
             )
         )
 
@@ -181,7 +187,11 @@ def test_in(self):
         client.api_execute = mock.Mock(
             return_value=FakeHTTPResponse(
                 200,
-                '{"action":"GET",' '"node": {' '"key":"/testkey",' '"value":"test",' '"modifiedIndex":190}}',
+                '{"action":"GET",'
+                '"node": {'
+                '"key":"/testkey",'
+                '"value":"test",'
+                '"modifiedIndex":190}}',
             )
         )
         result = "/testkey" in client

src/etcd/tests/unit/test_request.py

@@ -386,7 +386,9 @@ def _mock_api(self, status, d, cluster_id=None):
         self.client.http.request = mock.MagicMock(return_value=resp)
 
     def _mock_error(self, error_code, msg, cause, method="PUT", fields=None, cluster_id=None):
-        resp = self._prepare_response(500, {"errorCode": error_code, "message": msg, "cause": cause})
+        resp = self._prepare_response(
+            500, {"errorCode": error_code, "message": msg, "cause": cause}
+        )
         resp.getheader.return_value = cluster_id or "abcdef1234"
         self.client.http.request_encode_body = mock.create_autospec(
             self.client.http.request_encode_body, return_value=resp
@@ -402,7 +404,9 @@ def test_watch_timeout(self):
         """Exception will be raised if prevValue != value in test_set"""
         self.client.http.request = mock.create_autospec(
             self.client.http.request,
-            side_effect=urllib3.exceptions.ReadTimeoutError(self.client.http, "foo", "Read timed out"),
+            side_effect=urllib3.exceptions.ReadTimeoutError(
+                self.client.http, "foo", "Read timed out"
+            ),
         )
         self.assertRaises(
             etcd.EtcdWatchTimedOut,
@@ -435,7 +439,9 @@ def test_read_cluster_id_changed(self):
         self.client.read("/testkey")
 
     def test_read_connection_error(self):
-        self.client.http.request = mock.create_autospec(self.client.http.request, side_effect=socket.error())
+        self.client.http.request = mock.create_autospec(
+            self.client.http.request, side_effect=socket.error()
+        )
         self.assertRaises(etcd.EtcdConnectionFailed, self.client.read, "/something")
         # Direct GET request
         self.assertRaises(etcd.EtcdConnectionFailed, self.client.api_execute, "/a", "GET")