jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove auto_start option from fig.yml.

Browse source 
This option is redundant now that services can be started along with links.

Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
This commit is contained in:
Chris Corbyn 2014-06-21 10:39:36 +00:00
commit 247691ca44
7 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/fixtures/simple-figfile/fig.yml vendored
View file

@ -2,6 +2,5 @@ simple:
image: busybox:latest
command: /bin/sleep 300
another:
auto_start: false
image: busybox:latest
command: /bin/sleep 300

10
tests/integration/project_test.py
View file

@ -124,17 +124,17 @@ class ProjectTest(DockerClientTestCase):
project.kill()
project.remove_stopped()
def test_project_up_without_auto_start(self):
console = self.create_service('console', auto_start=False)
def test_project_up_without_all_services(self):
console = self.create_service('console')
db = self.create_service('db')
project = Project('figtest', [console, db], self.client)
project.start()
self.assertEqual(len(project.containers()), 0)
project.up()
self.assertEqual(len(project.containers()), 1)
self.assertEqual(len(project.containers()), 2)
self.assertEqual(len(db.containers()), 1)
self.assertEqual(len(console.containers()), 0)
self.assertEqual(len(console.containers()), 1)
project.kill()
project.remove_stopped()
@ -157,7 +157,7 @@ class ProjectTest(DockerClientTestCase):
project.kill()
project.remove_stopped()
def test_project_up_with_no_links(self):
def test_project_up_with_no_deps(self):
console = self.create_service('console')
db = self.create_service('db', volumes=['/var/db'])
web = self.create_service('web', links=[(db, 'db')])

6
tests/unit/project_test.py
View file

@ -68,7 +68,7 @@ class ProjectTest(unittest.TestCase):
project = Project('test', [web], None)
self.assertEqual(project.get_service('web'), web)
def test_get_services_returns_all_auto_started_without_args(self):
def test_get_services_returns_all_services_without_args(self):
web = Service(
project='figtest',
name='web',
@ -76,10 +76,9 @@ class ProjectTest(unittest.TestCase):
console = Service(
project='figtest',
name='console',
auto_start=False
)
project = Project('test', [web, console], None)
self.assertEqual(project.get_services(), [web])
self.assertEqual(project.get_services(), [web, console])
def test_get_services_returns_listed_services_with_args(self):
web = Service(
@ -89,7 +88,6 @@ class ProjectTest(unittest.TestCase):
console = Service(
project='figtest',
name='console',
auto_start=False
)
project = Project('test', [web, console], None)
self.assertEqual(project.get_services(['console']), [console])

4
tests/unit/service_test.py
View file

@ -20,10 +20,6 @@ class ServiceTest(unittest.TestCase):
Service('a')
Service('foo')
def test_auto_start_defaults_true(self):
service = Service(name='foo', project='bar')
self.assertEqual(service.options['auto_start'], True)
def test_project_validation(self):
self.assertRaises(ConfigError, lambda: Service(name='foo', project='_'))
Service(name='foo', project='bar')