tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 04:34:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use 12 characters for the short id to match docker and fix backwards compatibility.

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-02-08 12:18:48 -05:00
parent 28e652daec
commit 421981e7d2
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/container.py
View File

@ -60,7 +60,7 @@ class Container(object):
@property @property
def short_id(self): def short_id(self):
return self.id[:10] return self.id[:12]
@property @property
def name(self): def name(self):

22
tests/unit/container_test.py
View File

@ -12,8 +12,9 @@ from compose.container import get_container_name
class ContainerTest(unittest.TestCase): class ContainerTest(unittest.TestCase):
def setUp(self): def setUp(self):
self.container_id = "abcabcabcbabc12345"
self.container_dict = { self.container_dict = {
"Id": "abc", "Id": self.container_id,
"Image": "busybox:latest", "Image": "busybox:latest",
"Command": "top", "Command": "top",
"Created": 1387384730, "Created": 1387384730,
@ -41,19 +42,22 @@ class ContainerTest(unittest.TestCase):
self.assertEqual( self.assertEqual(
container.dictionary, container.dictionary,
{ {
"Id": "abc", "Id": self.container_id,
"Image": "busybox:latest", "Image": "busybox:latest",
"Name": "/composetest_db_1", "Name": "/composetest_db_1",
}) })
def test_from_ps_prefixed(self): def test_from_ps_prefixed(self):
self.container_dict['Names'] = ['/swarm-host-1' + n for n in self.container_dict['Names']] self.container_dict['Names'] = [
'/swarm-host-1' + n for n in self.container_dict['Names']
]
container = Container.from_ps(None, container = Container.from_ps(
self.container_dict, None,
has_been_inspected=True) self.container_dict,
has_been_inspected=True)
self.assertEqual(container.dictionary, { self.assertEqual(container.dictionary, {
"Id": "abc", "Id": self.container_id,
"Image": "busybox:latest", "Image": "busybox:latest",
"Name": "/composetest_db_1", "Name": "/composetest_db_1",
}) })
@ -142,6 +146,10 @@ class ContainerTest(unittest.TestCase):
self.assertEqual(container.get('HostConfig.VolumesFrom'), ["volume_id"]) self.assertEqual(container.get('HostConfig.VolumesFrom'), ["volume_id"])
self.assertEqual(container.get('Foo.Bar.DoesNotExist'), None) self.assertEqual(container.get('Foo.Bar.DoesNotExist'), None)
def test_short_id(self):
container = Container(None, self.container_dict, has_been_inspected=True)
assert container.short_id == self.container_id[:12]
class GetContainerNameTestCase(unittest.TestCase): class GetContainerNameTestCase(unittest.TestCase):