summaryrefslogtreecommitdiff
path: root/tests/integration_test.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-06-24 22:29:11 +0200
committerJoffrey F <joffrey@docker.com>2015-06-30 23:59:03 +0200
commit9e87884ba8cbddc0c7f2ad7ccdc11e172e844ac6 (patch)
tree8c312474bb9fa964b42bb5b53fde12b816af2af9 /tests/integration_test.py
parentc8c957c9831acaabc0cd5bb24eaa6e93a9a99e43 (diff)
downloaddocker-py-fix_647.tar.gz
Fix Unix socket adapter bug with double slash in path + regression testfix_647
Diffstat (limited to 'tests/integration_test.py')
-rw-r--r--tests/integration_test.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/integration_test.py b/tests/integration_test.py
index 4b9869e..ac4a871 100644
--- a/tests/integration_test.py
+++ b/tests/integration_test.py
@@ -872,8 +872,8 @@ class TestRunContainerStreaming(BaseTestCase):
id = container['Id']
self.client.start(id)
self.tmp_containers.append(id)
- socket = self.client.attach_socket(container, ws=False)
- self.assertTrue(socket.fileno() > -1)
+ sock = self.client.attach_socket(container, ws=False)
+ self.assertTrue(sock.fileno() > -1)
class TestPauseUnpauseContainer(BaseTestCase):
@@ -1467,12 +1467,17 @@ class TestRegressions(BaseTestCase):
result = self.client.containers(all=True, trunc=True)
self.assertEqual(len(result[0]['Id']), 12)
+ def test_647(self):
+ with self.assertRaises(docker.errors.APIError):
+ self.client.inspect_image('gensokyo.jp//kirisame')
+
def test_649(self):
self.client.timeout = None
ctnr = self.client.create_container('busybox', ['sleep', '2'])
self.client.start(ctnr)
self.client.stop(ctnr)
+
if __name__ == '__main__':
c = docker.Client(base_url=DEFAULT_BASE_URL)
c.pull('busybox')