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

Merge remote-tracking branch 'upstream/master' into feature/auto_start

Browse source 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>

Conflicts:
	tests/fixtures/simple-figfile/fig.yml
	tests/unit/project_test.py
This commit is contained in:
Chris Corbyn 2014-06-12 22:05:51 +00:00
commit 1b5bf6e12a
10 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/unit/container_test.py
View file

@ -6,7 +6,7 @@ class ContainerTest(unittest.TestCase):
def test_from_ps(self):
container = Container.from_ps(None, {
"Id":"abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Command":"sleep 300",
"Created":1387384730,
"Status":"Up 8 seconds",
@ -17,7 +17,7 @@ class ContainerTest(unittest.TestCase):
}, has_been_inspected=True)
self.assertEqual(container.dictionary, {
"ID": "abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Name": "/figtest_db_1",
})
@ -39,7 +39,7 @@ class ContainerTest(unittest.TestCase):
def test_number(self):
container = Container.from_ps(None, {
"Id":"abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Command":"sleep 300",
"Created":1387384730,
"Status":"Up 8 seconds",
@ -53,7 +53,7 @@ class ContainerTest(unittest.TestCase):
def test_name(self):
container = Container.from_ps(None, {
"Id":"abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Command":"sleep 300",
"Names":["/figtest_db_1"]
}, has_been_inspected=True)
@ -62,7 +62,7 @@ class ContainerTest(unittest.TestCase):
def test_name_without_project(self):
container = Container.from_ps(None, {
"Id":"abc",
"Image":"ubuntu:12.04",
"Image":"busybox:latest",
"Command":"sleep 300",
"Names":["/figtest_db_1"]
}, has_been_inspected=True)

24
tests/unit/project_test.py
View file

@ -8,29 +8,29 @@ class ProjectTest(unittest.TestCase):
project = Project.from_dicts('figtest', [
{
'name': 'web',
'image': 'ubuntu'
'image': 'busybox:latest'
},
{
'name': 'db',
'image': 'ubuntu'
'image': 'busybox:latest'
},
], None)
self.assertEqual(len(project.services), 2)
self.assertEqual(project.get_service('web').name, 'web')
self.assertEqual(project.get_service('web').options['image'], 'ubuntu')
self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
self.assertEqual(project.get_service('db').name, 'db')
self.assertEqual(project.get_service('db').options['image'], 'ubuntu')
self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
def test_from_dict_sorts_in_dependency_order(self):
project = Project.from_dicts('figtest', [
{
'name': 'web',
'image': 'ubuntu',
'image': 'busybox:latest',
'links': ['db'],
},
{
'name': 'db',
'image': 'ubuntu'
'image': 'busybox:latest'
}
], None)
@ -40,22 +40,22 @@ class ProjectTest(unittest.TestCase):
def test_from_config(self):
project = Project.from_config('figtest', {
'web': {
'image': 'ubuntu',
'image': 'busybox:latest',
},
'db': {
'image': 'ubuntu',
'image': 'busybox:latest',
},
}, None)
self.assertEqual(len(project.services), 2)
self.assertEqual(project.get_service('web').name, 'web')
self.assertEqual(project.get_service('web').options['image'], 'ubuntu')
self.assertEqual(project.get_service('web').options['image'], 'busybox:latest')
self.assertEqual(project.get_service('db').name, 'db')
self.assertEqual(project.get_service('db').options['image'], 'ubuntu')
self.assertEqual(project.get_service('db').options['image'], 'busybox:latest')
def test_from_config_throws_error_when_not_dict(self):
with self.assertRaises(ConfigurationError):
project = Project.from_config('figtest', {
'web': 'ubuntu',
'web': 'busybox:latest',
}, None)
def test_get_service(self):
@ -63,7 +63,7 @@ class ProjectTest(unittest.TestCase):
project='figtest',
name='web',
client=None,
image="ubuntu",
image="busybox:latest",
)
project = Project('test', [web], None)
self.assertEqual(project.get_service('web'), web)