Merge pull request #100 from mpetazzoni/pull-timeout

Restore disabling timeout on image pull

docker/client.py

@@ -524,7 +524,8 @@ class Client(requests.Session):
             if authcfg:
                 headers['X-Registry-Auth'] = auth.encode_header(authcfg)
         u = self._url("/images/create")
-        response = self._post(u, params=params, headers=headers, stream=stream)
+        response = self._post(u, params=params, headers=headers, stream=stream,
+                              timeout=None)
 
         if stream:
             return self._stream_helper(response)
@@ -608,7 +609,7 @@ class Client(requests.Session):
 
         if links:
             formatted_links = [
-                '{0}:{1}'.format(k, v) for k, v in six.iteritems(links)
+                '{0}:{1}'.format(k, v) for k, v in sorted(six.iteritems(links))
             ]
 
             start_config['Links'] = formatted_links

tests/test.py

@@ -348,7 +348,7 @@ class DockerClientTest(unittest.TestCase):
             {'Content-Type': 'application/json'}
         )
 
-        # multiple links
+    def test_start_container_with_multiple_links(self):
         try:
             link_path = 'path'
             alias = 'alias'
@@ -371,7 +371,7 @@ class DockerClientTest(unittest.TestCase):
             json.loads(args[1]['data']),
             {
                 "PublishAllPorts": False,
-                "Links": ["path2:alias2", "path1:alias1"]
+                "Links": ["path1:alias1", "path2:alias2"]
             }
         )
         self.assertEqual(