Refactor acl_consul fixture

This change is made in preparation for future releases, anticipating the likelihood of deploying multiple instances via Docker.

tests/api/test_acl.py

@@ -6,8 +6,7 @@
 
 class TestConsulAcl:
     def test_acl_permission_denied(self, acl_consul):
-        port, _master_token, _consul_version = acl_consul
-        c = consul.Consul(port=port)
+        c, _master_token, _consul_version = acl_consul
 
         # No token
         pytest.raises(consul.ACLPermissionDenied, c.acl.list)
@@ -46,8 +45,7 @@ def test_acl_permission_denied(self, acl_consul):
         )
 
     def test_acl_list(self, acl_consul):
-        port, master_token, _consul_version = acl_consul
-        c = consul.Consul(port=port)
+        c, master_token, _consul_version = acl_consul
 
         # Make sure both master and anonymous tokens are created
         acls = c.acl.list(token=master_token)
@@ -65,8 +63,7 @@ def test_acl_list(self, acl_consul):
         assert find_recursive(acls, anonymous_token_repr)
 
     def test_acl_read(self, acl_consul):
-        port, master_token, _consul_version = acl_consul
-        c = consul.Consul(port=port)
+        c, master_token, _consul_version = acl_consul
 
         # Unknown token
         pytest.raises(consul.ConsulException, c.acl.read, accessor_id="unknown", token=master_token)
@@ -79,8 +76,7 @@ def test_acl_read(self, acl_consul):
         assert find_recursive(acl, anonymous_token_repr)
 
     def test_acl_create(self, acl_consul):
-        port, master_token, _consul_version = acl_consul
-        c = consul.Consul(port=port)
+        c, master_token, _consul_version = acl_consul
 
         c.acl.create(accessor_id="00000000-DEAD-BEEF-0000-000000000000", token=master_token)
         c.acl.create(secret_id="DEADBEEF-0000-0000-0000-000000000000", token=master_token)
@@ -113,8 +109,7 @@ def test_acl_create(self, acl_consul):
         assert find_recursive(acl, expected)
 
     def test_acl_clone(self, acl_consul):
-        port, master_token, _consul_version = acl_consul
-        c = consul.Consul(port=port)
+        c, master_token, _consul_version = acl_consul
 
         assert len(c.acl.list(token=master_token)) == 2
 
@@ -137,8 +132,7 @@ def test_acl_clone(self, acl_consul):
         assert find_recursive(acl, expected)
 
     def test_acl_update(self, acl_consul):
-        port, master_token, _consul_version = acl_consul
-        c = consul.Consul(port=port)
+        c, master_token, _consul_version = acl_consul
 
         # Unknown token
         pytest.raises(consul.ConsulException, c.acl.update, accessor_id="unknown", token=master_token)
@@ -157,8 +151,7 @@ def test_acl_update(self, acl_consul):
         assert find_recursive(acl, expected)
 
     def test_acl_delete(self, acl_consul):
-        port, master_token, _consul_version = acl_consul
-        c = consul.Consul(port=port)
+        c, master_token, _consul_version = acl_consul
 
         assert len(c.acl.list(token=master_token)) == 2
         c.acl.create(accessor_id="00000000-DEAD-BEEF-0000-000000000000", token=master_token)

tests/conftest.py

@@ -22,6 +22,8 @@
     "1.17.3": "consul-1.17.3",
 }
 
+ACLConsul = collections.namedtuple("ACLConsul", ["instance", "token", "version"])
+
 
 def get_free_ports(num, host=None):
     if not host:
@@ -136,9 +138,8 @@ def consul_port(consul_instance):
 
 @pytest.fixture()
 def acl_consul(acl_consul_instance):
-    ACLConsul = collections.namedtuple("ACLConsul", ["port", "token", "version"])
-    port, token, version = acl_consul_instance
-    return ACLConsul(port, token, version)
+    consul_port, token, version = acl_consul_instance
+    return ACLConsul(Consul(port=consul_port), token, version)
 
 
 @pytest.fixture()

tests/test_aio.py

@@ -22,10 +22,10 @@ async def consul_obj(consul_port):
 
 @pytest.fixture()
 async def consul_acl_obj(acl_consul):
-    consul_port, token, consul_version = acl_consul
-    c = consul.aio.Consul(port=consul_port, token=token)
-    yield c, consul_version
-    await c.close()
+    consul, token, consul_version = acl_consul
+    consul.token = token
+    yield consul, consul_version
+    await consul.close()
 
 
 class TestAsyncioConsul: