From 3c8ef6a94c5d94446eabcbe27df33168ec52234d Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 13 Mar 2015 14:51:26 +0000
Subject: [PATCH] Fix Project.up() tests

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/integration/project_test.py | 37 +++++++++++++------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py
index 17b54daee..73e8badc3 100644
--- a/tests/integration/project_test.py
+++ b/tests/integration/project_test.py
@@ -264,20 +264,19 @@ class ProjectTest(DockerClientTestCase):
                     'image': 'busybox:latest',
                     'command': ["/bin/sleep", "300"],
                 },
-                'net' : {
+                'data' : {
                     'image': 'busybox:latest',
                     'command': ["/bin/sleep", "300"]
                 },
-                'app': {
+                'db': {
                     'image': 'busybox:latest',
                     'command': ["/bin/sleep", "300"],
-                    'net': 'container:net'
+                    'volumes_from': ['data'],
                 },
                 'web': {
                     'image': 'busybox:latest',
                     'command': ["/bin/sleep", "300"],
-                    'net': 'container:net',
-                    'links': ['app']
+                    'links': ['db'],
                 },
             },
             client=self.client,
@@ -288,8 +287,8 @@ class ProjectTest(DockerClientTestCase):
         project.up(['web'])
         self.assertEqual(len(project.containers()), 3)
         self.assertEqual(len(project.get_service('web').containers()), 1)
-        self.assertEqual(len(project.get_service('app').containers()), 1)
-        self.assertEqual(len(project.get_service('net').containers()), 1)
+        self.assertEqual(len(project.get_service('db').containers()), 1)
+        self.assertEqual(len(project.get_service('data').containers()), 1)
         self.assertEqual(len(project.get_service('console').containers()), 0)
 
         project.kill()
@@ -303,26 +302,19 @@ class ProjectTest(DockerClientTestCase):
                     'image': 'busybox:latest',
                     'command': ["/bin/sleep", "300"],
                 },
-                'net' : {
+                'data' : {
                     'image': 'busybox:latest',
                     'command': ["/bin/sleep", "300"]
                 },
-                'vol': {
+                'db': {
                     'image': 'busybox:latest',
                     'command': ["/bin/sleep", "300"],
-                    'volumes': ["/tmp"]
-                },
-                'app': {
-                    'image': 'busybox:latest',
-                    'command': ["/bin/sleep", "300"],
-                    'net': 'container:net'
+                    'volumes_from': ['data'],
                 },
                 'web': {
                     'image': 'busybox:latest',
                     'command': ["/bin/sleep", "300"],
-                    'net': 'container:net',
-                    'links': ['app'],
-                    'volumes_from': ['vol']
+                    'links': ['db'],
                 },
             },
             client=self.client,
@@ -330,11 +322,12 @@ class ProjectTest(DockerClientTestCase):
         project.start()
         self.assertEqual(len(project.containers()), 0)
 
-        project.up(['web'], start_deps=False)
+        project.up(['db'], start_deps=False)
         self.assertEqual(len(project.containers(stopped=True)), 2)
-        self.assertEqual(len(project.get_service('web').containers()), 1)
-        self.assertEqual(len(project.get_service('vol').containers(stopped=True)), 1)
-        self.assertEqual(len(project.get_service('net').containers()), 0)
+        self.assertEqual(len(project.get_service('web').containers()), 0)
+        self.assertEqual(len(project.get_service('db').containers()), 1)
+        self.assertEqual(len(project.get_service('data').containers()), 0)
+        self.assertEqual(len(project.get_service('data').containers(stopped=True)), 1)
         self.assertEqual(len(project.get_service('console').containers()), 0)
 
         project.kill()