Split monolithic integration tests into individual tests.

The integration tests require restarting the swarm once for each
test.  I had done so manually with self.init_swarm(force_new_cluster=True)
but that wasn't resetting the swarm state correctly.  The usual
test teardown procedure cleans up correctly.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>

1 files changed, 25 insertions, 24 deletions

diff --git a/tests/integration/api_swarm_test.py b/tests/integration/api_swarm_test.py
index 41fae57..37f5fa7 100644
--- a/tests/integration/api_swarm_test.py
+++ b/tests/integration/api_swarm_test.py
@@ -36,32 +36,33 @@ class SwarmTest(BaseAPIIntegrationTest):
         assert version_2 != version_1
 
     @requires_api_version('1.39')
-    def test_init_swarm_custom_addr_pool(self):
-        # test defaults
+    def test_init_swarm_custom_addr_pool_defaults(self):
         assert self.init_swarm()
-        results_1 = self.client.inspect_swarm()
-        assert set(results_1['DefaultAddrPool']) == {'10.0.0.0/8'}
-        assert results_1['SubnetSize'] == 24
-        # test addr pool alone
-        assert self.init_swarm(default_addr_pool=['2.0.0.0/16'],
-                               force_new_cluster=True)
-        results_2 = self.client.inspect_swarm()
-        assert set(results_2['DefaultAddrPool']) == {'2.0.0.0/16'}
-        assert results_2['SubnetSize'] == 24
-        # test subnet size alone
-        assert self.init_swarm(subnet_size=26,
-                               force_new_cluster=True)
-        results_3 = self.client.inspect_swarm()
-        assert set(results_3['DefaultAddrPool']) == {'10.0.0.0/8'}
-        assert results_3['SubnetSize'] == 26
-        # test both arguments together
+        results = self.client.inspect_swarm()
+        assert set(results['DefaultAddrPool']) == {'10.0.0.0/8'}
+        assert results['SubnetSize'] == 24
+
+    @requires_api_version('1.39')
+    def test_init_swarm_custom_addr_pool_only_pool(self):
+        assert self.init_swarm(default_addr_pool=['2.0.0.0/16'])
+        results = self.client.inspect_swarm()
+        assert set(results['DefaultAddrPool']) == {'2.0.0.0/16'}
+        assert results['SubnetSize'] == 24
+
+    @requires_api_version('1.39')
+    def test_init_swarm_custom_addr_pool_only_subnet_size(self):
+        assert self.init_swarm(subnet_size=26)
+        results = self.client.inspect_swarm()
+        assert set(results['DefaultAddrPool']) == {'10.0.0.0/8'}
+        assert results['SubnetSize'] == 26
+
+    @requires_api_version('1.39')
+    def test_init_swarm_custom_addr_pool_both_args(self):
         assert self.init_swarm(default_addr_pool=['2.0.0.0/16', '3.0.0.0/16'],
-                               subnet_size=28, force_new_cluster=True)
-        results_4 = self.client.inspect_swarm()
-        assert set(results_4['DefaultAddrPool']) == (
-            {'2.0.0.0/16', '3.0.0.0/16'}
-        )
-        assert results_4['SubnetSize'] == 28
+                               subnet_size=28)
+        results = self.client.inspect_swarm()
+        assert set(results['DefaultAddrPool']) == {'2.0.0.0/16', '3.0.0.0/16'}
+        assert results['SubnetSize'] == 28
 
     @requires_api_version('1.24')
     def test_init_already_in_cluster(self):