docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support requests >=2.1.0 

Starting with requests 2.1.0 non-HTTP scheme URLs are not parsed anymore.
The net effect of this is that when using the unix socket in docker-py no
query string params are passed in the URL.  This change makes docker-py
internally use the scheme http+unix to indicate to requests that this is
still a HTTP URL and should be parsed.

Users of docker-py can still specify 'unix:' as the base_url.  The
following forms of base_url are accepted.

  http+unix://var/run/docker.sock
  unix://var/run/docker.sock
  unix:///var/run/docker.sock
  http://hostname
  tcp://hostname
This commit is contained in:
Darren Shepherd 2014-01-26 16:27:27 -07:00
parent 3ad4a442be
commit 89922efbac
4 changed files with 93 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/client.py
View File

@ -69,9 +69,11 @@ class Client(requests.Session):
timeout=DEFAULT_TIMEOUT_SECONDS): timeout=DEFAULT_TIMEOUT_SECONDS):
super(Client, self).__init__() super(Client, self).__init__()
if base_url is None: if base_url is None:
base_url = "unix://var/run/docker.sock" base_url = "http+unix://var/run/docker.sock"
if base_url.startswith('unix:///'): if 'unix:///' in base_url:
base_url = base_url.replace('unix:/', 'unix:') base_url = base_url.replace('unix:/', 'unix:')
if base_url.startswith('unix:'):
base_url = "http+" + base_url
if base_url.startswith('tcp:'): if base_url.startswith('tcp:'):
base_url = base_url.replace('tcp:', 'http:') base_url = base_url.replace('tcp:', 'http:')
if base_url.endswith('/'): if base_url.endswith('/'):
@ -81,7 +83,7 @@ class Client(requests.Session):
self._timeout = timeout self._timeout = timeout
self._auth_configs = auth.load_config() self._auth_configs = auth.load_config()
self.mount('unix://', unixconn.UnixAdapter(base_url, timeout)) self.mount('http+unix://', unixconn.UnixAdapter(base_url, timeout))
def _set_request_timeout(self, kwargs): def _set_request_timeout(self, kwargs):
"""Prepare the kwargs for an HTTP request by inserting the timeout """Prepare the kwargs for an HTTP request by inserting the timeout

2
docker/unixconn/unixconn.py
View File

@ -36,7 +36,7 @@ class UnixHTTPConnection(httplib.HTTPConnection, object):
def connect(self): def connect(self):
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
sock.settimeout(self.timeout) sock.settimeout(self.timeout)
sock.connect(self.base_url.replace("unix:/", "")) sock.connect(self.base_url.replace("http+unix:/", ""))
self.sock = sock self.sock = sock
def _extract_path(self, url): def _extract_path(self, url):

2
tests/fake_api.py
View File

@ -276,7 +276,7 @@ def post_fake_tag_image():
## maps real api url to fake response callback ## maps real api url to fake response callback
prefix = 'unix://var/run/docker.sock' prefix = 'http+unix://var/run/docker.sock'
fake_responses = { fake_responses = {
'{1}/{0}/version'.format(CURRENT_VERSION, prefix): '{1}/{0}/version'.format(CURRENT_VERSION, prefix):
get_fake_version, get_fake_version,

145
tests/test.py
View File

@ -75,7 +75,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/version', 'http+unix://var/run/docker.sock/v1.6/version',
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -86,7 +86,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/info', 'http+unix://var/run/docker.sock/v1.6/info',
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -97,7 +97,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/search', 'http+unix://var/run/docker.sock/v1.6/images/search',
params={'term': 'busybox'}, params={'term': 'busybox'},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -112,7 +112,7 @@ class DockerClientTest(unittest.TestCase):
except Exception as e: except Exception as e:
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/json', 'http+unix://var/run/docker.sock/v1.6/images/json',
params={'filter': None, 'only_ids': 0, 'all': 1}, params={'filter': None, 'only_ids': 0, 'all': 1},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -123,7 +123,7 @@ class DockerClientTest(unittest.TestCase):
except Exception as e: except Exception as e:
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/json', 'http+unix://var/run/docker.sock/v1.6/images/json',
params={'filter': None, 'only_ids': 1, 'all': 1}, params={'filter': None, 'only_ids': 1, 'all': 1},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -135,7 +135,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/json', 'http+unix://var/run/docker.sock/v1.6/images/json',
params={'filter': None, 'only_ids': 1, 'all': 0}, params={'filter': None, 'only_ids': 1, 'all': 0},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -147,7 +147,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/json', 'http+unix://var/run/docker.sock/v1.6/containers/json',
params={ params={
'all': 1, 'all': 1,
'since': None, 'since': None,
@ -170,7 +170,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], self.assertEqual(args[0][0],
'unix://var/run/docker.sock/v1.6/containers/create') 'http+unix://var/run/docker.sock/v1.6/containers/create')
self.assertEqual(json.loads(args[1]['data']), self.assertEqual(json.loads(args[1]['data']),
json.loads(''' json.loads('''
{"Tty": false, "Image": "busybox", "Cmd": ["true"], {"Tty": false, "Image": "busybox", "Cmd": ["true"],
@ -192,7 +192,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], self.assertEqual(args[0][0],
'unix://var/run/docker.sock/v1.6/containers/create') 'http+unix://var/run/docker.sock/v1.6/containers/create')
self.assertEqual(json.loads(args[1]['data']), self.assertEqual(json.loads(args[1]['data']),
json.loads(''' json.loads('''
{"Tty": false, "Image": "busybox", {"Tty": false, "Image": "busybox",
@ -213,7 +213,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], self.assertEqual(args[0][0],
'unix://var/run/docker.sock/v1.6/containers/create') 'http+unix://var/run/docker.sock/v1.6/containers/create')
self.assertEqual(json.loads(args[1]['data']), self.assertEqual(json.loads(args[1]['data']),
json.loads(''' json.loads('''
{"Tty": false, "Image": "busybox", {"Tty": false, "Image": "busybox",
@ -238,7 +238,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], self.assertEqual(args[0][0],
'unix://var/run/docker.sock/v1.6/containers/create') 'http+unix://var/run/docker.sock/v1.6/containers/create')
self.assertEqual(json.loads(args[1]['data']), self.assertEqual(json.loads(args[1]['data']),
json.loads(''' json.loads('''
{"Tty": false, "Image": "busybox", {"Tty": false, "Image": "busybox",
@ -260,7 +260,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], self.assertEqual(args[0][0],
'unix://var/run/docker.sock/v1.6/containers/create') 'http+unix://var/run/docker.sock/v1.6/containers/create')
self.assertEqual(json.loads(args[1]['data']), self.assertEqual(json.loads(args[1]['data']),
json.loads(''' json.loads('''
{"Tty": false, "Image": "busybox", {"Tty": false, "Image": "busybox",
@ -282,7 +282,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], self.assertEqual(args[0][0],
'unix://var/run/docker.sock/v1.6/containers/create') 'http+unix://var/run/docker.sock/v1.6/containers/create')
self.assertEqual(json.loads(args[1]['data']), self.assertEqual(json.loads(args[1]['data']),
json.loads(''' json.loads('''
{"Tty": false, "Image": "busybox", {"Tty": false, "Image": "busybox",
@ -304,7 +304,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], self.assertEqual(args[0][0],
'unix://var/run/docker.sock/v1.6/containers/create') 'http+unix://var/run/docker.sock/v1.6/containers/create')
self.assertEqual(json.loads(args[1]['data']), self.assertEqual(json.loads(args[1]['data']),
json.loads(''' json.loads('''
{"Tty": false, "Image": "busybox", "Cmd": ["true"], {"Tty": false, "Image": "busybox", "Cmd": ["true"],
@ -319,11 +319,12 @@ class DockerClientTest(unittest.TestCase):
try: try:
self.client.start(fake_api.FAKE_CONTAINER_ID) self.client.start(fake_api.FAKE_CONTAINER_ID)
except Exception as e: except Exception as e:
raise e
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
args = fake_request.call_args args = fake_request.call_args
self.assertEqual( self.assertEqual(
args[0][0], args[0][0],
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start' 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start'
) )
self.assertEqual( self.assertEqual(
json.loads(args[1]['data']), json.loads(args[1]['data']),
@ -349,7 +350,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual( self.assertEqual(
args[0][0], args[0][0],
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start' 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start'
) )
self.assertEqual( self.assertEqual(
json.loads(args[1]['data']), json.loads(args[1]['data']),
@ -375,7 +376,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], 'unix://var/run/docker.sock/v1.6/' self.assertEqual(args[0][0], 'http+unix://var/run/docker.sock/v1.6/'
'containers/3cc2351ab11b/start') 'containers/3cc2351ab11b/start')
self.assertEqual( self.assertEqual(
json.loads(args[1]['data']), json.loads(args[1]['data']),
@ -402,7 +403,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], 'unix://var/run/docker.sock/v1.6/' self.assertEqual(args[0][0], 'http+unix://var/run/docker.sock/v1.6/'
'containers/3cc2351ab11b/start') 'containers/3cc2351ab11b/start')
self.assertEqual(json.loads(args[1]['data']), self.assertEqual(json.loads(args[1]['data']),
{"Binds": ["/tmp:/mnt"], {"Binds": ["/tmp:/mnt"],
@ -430,7 +431,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
args = fake_request.call_args args = fake_request.call_args
self.assertEqual(args[0][0], 'unix://var/run/docker.sock/v1.6/' self.assertEqual(args[0][0], 'http+unix://var/run/docker.sock/v1.6/'
'containers/3cc2351ab11b/start') 'containers/3cc2351ab11b/start')
data = json.loads(args[1]['data']) data = json.loads(args[1]['data'])
self.assertEqual(data['PublishAllPorts'], False) self.assertEqual(data['PublishAllPorts'], False)
@ -481,7 +482,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual( self.assertEqual(
args[0][0], args[0][0],
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start' 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start'
) )
self.assertEqual( self.assertEqual(
json.loads(args[1]['data']), json.loads(args[1]['data']),
@ -510,7 +511,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual( self.assertEqual(
args[0][0], args[0][0],
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start' 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start'
) )
self.assertEqual( self.assertEqual(
json.loads(args[1]['data']), json.loads(args[1]['data']),
@ -534,7 +535,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual( self.assertEqual(
args[0][0], args[0][0],
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start' 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start'
) )
self.assertEqual(json.loads(args[1]['data']), self.assertEqual(json.loads(args[1]['data']),
{"PublishAllPorts": False, "Privileged": True}) {"PublishAllPorts": False, "Privileged": True})
@ -553,7 +554,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual( self.assertEqual(
args[0][0], args[0][0],
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start' 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/start'
) )
self.assertEqual( self.assertEqual(
json.loads(args[1]['data']), json.loads(args[1]['data']),
@ -575,7 +576,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/wait', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/wait',
timeout=None timeout=None
) )
@ -583,13 +584,39 @@ class DockerClientTest(unittest.TestCase):
try: try:
self.client.wait({'Id': fake_api.FAKE_CONTAINER_ID}) self.client.wait({'Id': fake_api.FAKE_CONTAINER_ID})
except Exception as e: except Exception as e:
raise e
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/wait', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/wait',
timeout=None timeout=None
) )
def test_url_compatibility_unix(self):
c = docker.Client(base_url="unix://socket")
assert c.base_url == "http+unix://socket"
def test_url_compatibility_unix_triple_slash(self):
c = docker.Client(base_url="unix:///socket")
assert c.base_url == "http+unix://socket"
def test_url_compatibility_http_unix_triple_slash(self):
c = docker.Client(base_url="http+unix:///socket")
assert c.base_url == "http+unix://socket"
def test_url_compatibility_http(self):
c = docker.Client(base_url="http://hostname")
assert c.base_url == "http://hostname"
def test_url_compatibility_tcp(self):
c = docker.Client(base_url="tcp://hostname")
assert c.base_url == "http://hostname"
def test_logs(self): def test_logs(self):
try: try:
self.client.logs(fake_api.FAKE_CONTAINER_ID) self.client.logs(fake_api.FAKE_CONTAINER_ID)
@ -597,7 +624,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/attach', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/attach',
params={'stream': 0, 'logs': 1, 'stderr': 1, 'stdout': 1}, params={'stream': 0, 'logs': 1, 'stderr': 1, 'stdout': 1},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS, timeout=docker.client.DEFAULT_TIMEOUT_SECONDS,
stream=False stream=False
@ -610,7 +637,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/attach', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/attach',
params={'stream': 0, 'logs': 1, 'stderr': 1, 'stdout': 1}, params={'stream': 0, 'logs': 1, 'stderr': 1, 'stdout': 1},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS, timeout=docker.client.DEFAULT_TIMEOUT_SECONDS,
stream=False stream=False
@ -623,7 +650,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/attach', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/attach',
params={'stream': 1, 'logs': 1, 'stderr': 1, 'stdout': 1}, params={'stream': 1, 'logs': 1, 'stderr': 1, 'stdout': 1},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS, timeout=docker.client.DEFAULT_TIMEOUT_SECONDS,
stream=True stream=True
@ -636,7 +663,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/changes', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/changes',
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -647,7 +674,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/changes', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/changes',
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -658,7 +685,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/json', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/json',
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -669,7 +696,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/stop', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/stop',
params={'t': 2}, params={'t': 2},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -681,7 +708,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/stop', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/stop',
params={'t': 2}, params={'t': 2},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -693,7 +720,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/kill', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/kill',
params={}, params={},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -705,7 +732,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/kill', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/kill',
params={}, params={},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -717,7 +744,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/kill', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/kill',
params={'signal': signal.SIGTERM}, params={'signal': signal.SIGTERM},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -729,7 +756,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception : {0}'.format(e)) self.fail('Command should not raise exception : {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/restart', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/restart',
params={'t': 2}, params={'t': 2},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -741,7 +768,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/restart', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/restart',
params={'t': 2}, params={'t': 2},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -753,7 +780,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b',
params={'v': False, 'link': False}, params={'v': False, 'link': False},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -765,7 +792,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b',
params={'v': False, 'link': False}, params={'v': False, 'link': False},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -777,7 +804,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b',
params={'v': False, 'link': True}, params={'v': False, 'link': True},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -789,7 +816,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/export', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/export',
stream=True, stream=True,
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -801,7 +828,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/export', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/export',
stream=True, stream=True,
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -813,7 +840,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/json', 'http+unix://var/run/docker.sock/v1.6/containers/3cc2351ab11b/json',
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -830,7 +857,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual( self.assertEqual(
args[0][0], args[0][0],
'unix://var/run/docker.sock/v1.6/images/create' 'http+unix://var/run/docker.sock/v1.6/images/create'
) )
self.assertEqual( self.assertEqual(
args[1]['params'], args[1]['params'],
@ -847,7 +874,7 @@ class DockerClientTest(unittest.TestCase):
args = fake_request.call_args args = fake_request.call_args
self.assertEqual( self.assertEqual(
args[0][0], args[0][0],
'unix://var/run/docker.sock/v1.6/images/create' 'http+unix://var/run/docker.sock/v1.6/images/create'
) )
self.assertEqual( self.assertEqual(
args[1]['params'], args[1]['params'],
@ -862,7 +889,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/commit', 'http+unix://var/run/docker.sock/v1.6/commit',
data='{}', data='{}',
headers={'Content-Type': 'application/json'}, headers={'Content-Type': 'application/json'},
params={ params={
@ -882,7 +909,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/e9aa60c60128', 'http+unix://var/run/docker.sock/v1.6/images/e9aa60c60128',
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -893,7 +920,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/test_image/history', 'http+unix://var/run/docker.sock/v1.6/images/test_image/history',
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -908,7 +935,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/create', 'http+unix://var/run/docker.sock/v1.6/images/create',
params={ params={
'repo': fake_api.FAKE_REPO_NAME, 'repo': fake_api.FAKE_REPO_NAME,
'tag': fake_api.FAKE_TAG_NAME, 'tag': fake_api.FAKE_TAG_NAME,
@ -931,7 +958,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/create', 'http+unix://var/run/docker.sock/v1.6/images/create',
params={ params={
'repo': fake_api.FAKE_REPO_NAME, 'repo': fake_api.FAKE_REPO_NAME,
'tag': fake_api.FAKE_TAG_NAME, 'tag': fake_api.FAKE_TAG_NAME,
@ -954,7 +981,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/create', 'http+unix://var/run/docker.sock/v1.6/images/create',
params={ params={
'repo': fake_api.FAKE_REPO_NAME, 'repo': fake_api.FAKE_REPO_NAME,
'tag': fake_api.FAKE_TAG_NAME, 'tag': fake_api.FAKE_TAG_NAME,
@ -971,7 +998,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/test_image/json', 'http+unix://var/run/docker.sock/v1.6/images/test_image/json',
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -983,7 +1010,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/test_image/insert', 'http+unix://var/run/docker.sock/v1.6/images/test_image/insert',
params={ params={
'url': fake_api.FAKE_URL, 'url': fake_api.FAKE_URL,
'path': fake_api.FAKE_PATH 'path': fake_api.FAKE_PATH
@ -998,7 +1025,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/test_image/push', 'http+unix://var/run/docker.sock/v1.6/images/test_image/push',
data='{}', data='{}',
headers={'Content-Type': 'application/json'}, headers={'Content-Type': 'application/json'},
stream=False, stream=False,
@ -1012,7 +1039,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/test_image/push', 'http+unix://var/run/docker.sock/v1.6/images/test_image/push',
data='{}', data='{}',
headers={'Content-Type': 'application/json'}, headers={'Content-Type': 'application/json'},
stream=True, stream=True,
@ -1026,7 +1053,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/e9aa60c60128/tag', 'http+unix://var/run/docker.sock/v1.6/images/e9aa60c60128/tag',
params={ params={
'tag': None, 'tag': None,
'repo': 'repo', 'repo': 'repo',
@ -1046,7 +1073,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/e9aa60c60128/tag', 'http+unix://var/run/docker.sock/v1.6/images/e9aa60c60128/tag',
params={ params={
'tag': 'tag', 'tag': 'tag',
'repo': 'repo', 'repo': 'repo',
@ -1063,7 +1090,7 @@ class DockerClientTest(unittest.TestCase):
self.fail('Command should not raise exception: {0}'.format(e)) self.fail('Command should not raise exception: {0}'.format(e))
fake_request.assert_called_with( fake_request.assert_called_with(
'unix://var/run/docker.sock/v1.6/images/e9aa60c60128/tag', 'http+unix://var/run/docker.sock/v1.6/images/e9aa60c60128/tag',
params={ params={
'tag': None, 'tag': None,
'repo': 'repo', 'repo': 'repo',