From b59436742b90bab56e08a8ae4afaafe2d1efa863 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Tue, 10 Dec 2013 20:47:08 +0000
Subject: [PATCH] Reorganise tests

---
 plum/tests/service_collection_test.py |  4 +--
 plum/tests/service_test.py            | 41 +++++++++++----------------
 plum/tests/testcases.py               |  2 +-
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/plum/tests/service_collection_test.py b/plum/tests/service_collection_test.py
index 8029b6e9f..8d36e996d 100644
--- a/plum/tests/service_collection_test.py
+++ b/plum/tests/service_collection_test.py
@@ -1,9 +1,9 @@
 from plum.service import Service
 from plum.service_collection import ServiceCollection
-from .testcases import ServiceTestCase
+from .testcases import DockerClientTestCase
 
 
-class ServiceCollectionTest(ServiceTestCase):
+class ServiceCollectionTest(DockerClientTestCase):
     def test_from_dict(self):
         collection = ServiceCollection.from_dicts(None, [
             {
diff --git a/plum/tests/service_test.py b/plum/tests/service_test.py
index 9c3726bcd..51289e68c 100644
--- a/plum/tests/service_test.py
+++ b/plum/tests/service_test.py
@@ -1,8 +1,8 @@
 from plum import Service
-from .testcases import ServiceTestCase
+from .testcases import DockerClientTestCase
 
 
-class NameTestCase(ServiceTestCase):
+class NameTestCase(DockerClientTestCase):
     def test_name_validations(self):
         self.assertRaises(ValueError, lambda: Service(name=''))
 
@@ -18,8 +18,6 @@ class NameTestCase(ServiceTestCase):
         Service('_')
         Service('_____')
 
-
-class ContainersTestCase(ServiceTestCase):
     def test_containers(self):
         foo = self.create_service('foo')
         bar = self.create_service('bar')
@@ -39,35 +37,28 @@ class ContainersTestCase(ServiceTestCase):
         self.assertIn(['/bar_1'], names)
         self.assertIn(['/bar_2'], names)
 
-
-class ScalingTestCase(ServiceTestCase):
-    def setUp(self):
-        super(ServiceTestCase, self).setUp()
-        self.service = self.create_service("scaling_test")
-
     def test_up_scale_down(self):
-        self.assertEqual(len(self.service.containers), 0)
+        service = self.create_service('scaling_test')
+        self.assertEqual(len(service.containers), 0)
 
-        self.service.start()
-        self.assertEqual(len(self.service.containers), 1)
+        service.start()
+        self.assertEqual(len(service.containers), 1)
 
-        self.service.start()
-        self.assertEqual(len(self.service.containers), 1)
+        service.start()
+        self.assertEqual(len(service.containers), 1)
 
-        self.service.scale(2)
-        self.assertEqual(len(self.service.containers), 2)
+        service.scale(2)
+        self.assertEqual(len(service.containers), 2)
 
-        self.service.scale(1)
-        self.assertEqual(len(self.service.containers), 1)
+        service.scale(1)
+        self.assertEqual(len(service.containers), 1)
 
-        self.service.stop()
-        self.assertEqual(len(self.service.containers), 0)
+        service.stop()
+        self.assertEqual(len(service.containers), 0)
 
-        self.service.stop()
-        self.assertEqual(len(self.service.containers), 0)
+        service.stop()
+        self.assertEqual(len(service.containers), 0)
 
-
-class LinksTestCase(ServiceTestCase):
     def test_links_are_created_when_starting(self):
         db = self.create_service('db')
         web = self.create_service('web', links=[db])
diff --git a/plum/tests/testcases.py b/plum/tests/testcases.py
index df13e752b..8fc65ee87 100644
--- a/plum/tests/testcases.py
+++ b/plum/tests/testcases.py
@@ -4,7 +4,7 @@ import os
 from unittest import TestCase
 
 
-class ServiceTestCase(TestCase):
+class DockerClientTestCase(TestCase):
     @classmethod
     def setUpClass(cls):
         if os.environ.get('DOCKER_URL'):