From 853d8ad28078159fcd74fcac3b6868408a9fca25 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Thu, 2 Jan 2014 15:27:51 +0000
Subject: [PATCH] Namespace tests inside a project

So it doesn't delete all your containers for every test. Cool.
---
 tests/project_test.py |  6 +++---
 tests/service_test.py | 22 ++++++++++++----------
 tests/testcases.py    |  6 ++++--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/tests/project_test.py b/tests/project_test.py
index 5d0d1e72a..82b9be9df 100644
--- a/tests/project_test.py
+++ b/tests/project_test.py
@@ -4,7 +4,7 @@ from .testcases import DockerClientTestCase
 
 class ProjectTest(DockerClientTestCase):
     def test_from_dict(self):
-        project = Project.from_dicts('test', [
+        project = Project.from_dicts('figtest', [
             {
                 'name': 'web',
                 'image': 'ubuntu'
@@ -21,7 +21,7 @@ class ProjectTest(DockerClientTestCase):
         self.assertEqual(project.get_service('db').options['image'], 'ubuntu')
 
     def test_from_dict_sorts_in_dependency_order(self):
-        project = Project.from_dicts('test', [
+        project = Project.from_dicts('figtest', [
             {
                 'name': 'web',
                 'image': 'ubuntu',
@@ -57,7 +57,7 @@ class ProjectTest(DockerClientTestCase):
     def test_start_stop_kill_remove(self):
         web = self.create_service('web')
         db = self.create_service('db')
-        project = Project('test', [web, db], self.client)
+        project = Project('figtest', [web, db], self.client)
 
         project.start()
 
diff --git a/tests/service_test.py b/tests/service_test.py
index 02b96ab8e..f946ab38f 100644
--- a/tests/service_test.py
+++ b/tests/service_test.py
@@ -29,7 +29,7 @@ class ServiceTest(DockerClientTestCase):
         foo.start_container()
 
         self.assertEqual(len(foo.containers()), 1)
-        self.assertEqual(foo.containers()[0].name, 'default_foo_1')
+        self.assertEqual(foo.containers()[0].name, 'figtest_foo_1')
         self.assertEqual(len(bar.containers()), 0)
 
         bar.start_container()
@@ -39,8 +39,8 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(len(bar.containers()), 2)
 
         names = [c.name for c in bar.containers()]
-        self.assertIn('default_bar_1', names)
-        self.assertIn('default_bar_2', names)
+        self.assertIn('figtest_bar_1', names)
+        self.assertIn('figtest_bar_2', names)
 
     def test_containers_one_off(self):
         db = self.create_service('db')
@@ -49,9 +49,9 @@ class ServiceTest(DockerClientTestCase):
         self.assertEqual(db.containers(one_off=True, stopped=True), [container])
 
     def test_project_is_added_to_container_name(self):
-        service = self.create_service('web', project='myproject')
+        service = self.create_service('web')
         service.start_container()
-        self.assertEqual(service.containers()[0].name, 'myproject_web_1')
+        self.assertEqual(service.containers()[0].name, 'figtest_web_1')
 
     def test_start_stop(self):
         service = self.create_service('scalingtest')
@@ -92,13 +92,13 @@ class ServiceTest(DockerClientTestCase):
     def test_create_container_with_one_off(self):
         db = self.create_service('db')
         container = db.create_container(one_off=True)
-        self.assertEqual(container.name, 'default_db_run_1')
+        self.assertEqual(container.name, 'figtest_db_run_1')
 
     def test_create_container_with_one_off_when_existing_container_is_running(self):
         db = self.create_service('db')
         db.start()
         container = db.create_container(one_off=True)
-        self.assertEqual(container.name, 'default_db_run_1')
+        self.assertEqual(container.name, 'figtest_db_run_1')
 
     def test_start_container_passes_through_options(self):
         db = self.create_service('db')
@@ -115,7 +115,7 @@ class ServiceTest(DockerClientTestCase):
         web = self.create_service('web', links=[db])
         db.start_container()
         web.start_container()
-        self.assertIn('default_db_1', web.containers()[0].links())
+        self.assertIn('figtest_db_1', web.containers()[0].links())
         db.stop(timeout=1)
         web.stop(timeout=1)
 
@@ -124,18 +124,20 @@ class ServiceTest(DockerClientTestCase):
             name='test',
             client=self.client,
             build='tests/fixtures/simple-dockerfile',
+            project='figtest',
         )
         container = service.start_container()
         container.wait()
         self.assertIn('success', container.logs())
-        self.assertEqual(len(self.client.images(name='default_test')), 1)
+        self.assertEqual(len(self.client.images(name='figtest_test')), 1)
 
     def test_start_container_uses_tagged_image_if_it_exists(self):
-        self.client.build('tests/fixtures/simple-dockerfile', tag='default_test')
+        self.client.build('tests/fixtures/simple-dockerfile', tag='figtest_test')
         service = Service(
             name='test',
             client=self.client,
             build='this/does/not/exist/and/will/throw/error',
+            project='figtest',
         )
         container = service.start_container()
         container.wait()
diff --git a/tests/testcases.py b/tests/testcases.py
index b363bc003..d43ab3944 100644
--- a/tests/testcases.py
+++ b/tests/testcases.py
@@ -12,11 +12,13 @@ class DockerClientTestCase(TestCase):
 
     def setUp(self):
         for c in self.client.containers(all=True):
-            self.client.kill(c['Id'])
-            self.client.remove_container(c['Id'])
+            if c['Names'] and 'figtest' in c['Names'][0]:
+                self.client.kill(c['Id'])
+                self.client.remove_container(c['Id'])
 
     def create_service(self, name, **kwargs):
         return Service(
+            project='figtest',
             name=name,
             client=self.client,
             image="ubuntu",