Merge pull request docker#735 from aanand/test-network-mode-version

Explicitly test NetworkMode logic in create_host_config

Author: shin-

docker/client.py

@@ -271,6 +271,11 @@ def create_container_from_config(self, config, name=None):
     def create_host_config(self, *args, **kwargs):
         if not kwargs:
             kwargs = {}
+        if 'version' in kwargs:
+            raise TypeError(
+                "create_host_config() got an unexpected "
+                "keyword argument 'version'"
+            )
         kwargs['version'] = self._version
         return utils.create_host_config(*args, **kwargs)
 

tests/utils_test.py

@@ -144,11 +144,13 @@ def test_convert_filters(self):
         for filters, expected in tests:
             self.assertEqual(convert_filters(filters), expected)
 
-    def test_create_empty_host_config(self):
-        empty_config = create_host_config(
-            network_mode='', version=DEFAULT_DOCKER_API_VERSION
-        )
-        self.assertEqual(empty_config, {})
+    def test_create_host_config_no_options(self):
+        config = create_host_config(version='1.19')
+        self.assertFalse('NetworkMode' in config)
+
+    def test_create_host_config_no_options_newer_api_version(self):
+        config = create_host_config(version='1.20')
+        self.assertEqual(config['NetworkMode'], 'default')
 
     def test_create_host_config_dict_ulimit(self):
         ulimit_dct = {'name': 'nofile', 'soft': 8096}