summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2015-02-27 11:47:57 -0800
committerJoffrey F <f.joffrey@gmail.com>2015-02-27 11:47:57 -0800
commit0fae821350097d712b512a65d66f7f5f9cab7599 (patch)
treeb137745199e6c14a8b0a0c2a4a2b1689c04c4cad
parenta341aa2d268c3773d9988a7a1775441e25a6134b (diff)
parent21cc9916fd8a9d78470b2a525288a2d4d436db0c (diff)
downloaddocker-py-0fae821350097d712b512a65d66f7f5f9cab7599.tar.gz
Merge pull request #508 from docker/de-i11003
Rename test fix to take into account docker/docker#11003
-rw-r--r--tests/integration_test.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/integration_test.py b/tests/integration_test.py
index 869d61e..9dbbc6e 100644
--- a/tests/integration_test.py
+++ b/tests/integration_test.py
@@ -351,6 +351,7 @@ class TestCreateContainerWithName(BaseTestCase):
class TestRenameContainer(BaseTestCase):
def runTest(self):
+ version = self.client.version()['Version']
name = 'hong_meiling'
res = self.client.create_container('busybox', 'true')
self.assertIn('Id', res)
@@ -358,7 +359,10 @@ class TestRenameContainer(BaseTestCase):
self.client.rename(res, name)
inspect = self.client.inspect_container(res['Id'])
self.assertIn('Name', inspect)
- self.assertEqual(name, inspect['Name'])
+ if version == '1.5.0':
+ self.assertEqual(name, inspect['Name'])
+ else:
+ self.assertEqual('/{0}'.format(name), inspect['Name'])
class TestStartContainer(BaseTestCase):