Revert "Change special case from '_', None to ()"

This reverts commit 677c50650c86b4b6fabbc21e18165f2117022bbe.

Revert "Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior"

This reverts commit 001903771260069c475738efbbcb830dd9cf8227.

Revert "Mangle the tests. They pass for better or worse!"

This reverts commit 7ab9509ce65167dc81dd14f34cddfb5ecff1329d.

Revert "If an env var is passthrough but not defined on the host don't set it."

This reverts commit 6540efb3d380e7ae50dd94493a43382f31e1e004.

Signed-off-by: Daniel Nephin <[email protected]>

compose/config/config.py

@@ -512,12 +512,12 @@ def resolve_environment(service_dict):
         env.update(env_vars_from_file(env_file))
 
     env.update(parse_environment(service_dict.get('environment')))
-    return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(env))))
+    return dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
 
 
 def resolve_build_args(build):
     args = parse_build_arguments(build.get('args'))
-    return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(args))))
+    return dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
 
 
 def validate_extended_service_dict(service_dict, filename, service):
@@ -827,7 +827,7 @@ def resolve_env_var(key, val):
     elif key in os.environ:
         return key, os.environ[key]
     else:
-        return ()
+        return key, ''
 
 
 def env_vars_from_file(filename):

tests/integration/service_test.py

@@ -916,6 +916,7 @@ class ServiceTest(DockerClientTestCase):
             'FILE_DEF': 'F1',
             'FILE_DEF_EMPTY': '',
             'ENV_DEF': 'E3',
+            'NO_DEF': ''
         }.items():
             self.assertEqual(env[k], v)
 

tests/unit/config/config_test.py

@@ -1975,7 +1975,7 @@ class EnvTest(unittest.TestCase):
         }
         self.assertEqual(
             resolve_environment(service_dict),
-            {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3'},
+            {'FILE_DEF': 'F1', 'FILE_DEF_EMPTY': '', 'ENV_DEF': 'E3', 'NO_DEF': ''},
         )
 
     def test_resolve_environment_from_env_file(self):
@@ -2016,6 +2016,7 @@ class EnvTest(unittest.TestCase):
                 'FILE_DEF': u'bär',
                 'FILE_DEF_EMPTY': '',
                 'ENV_DEF': 'E3',
+                'NO_DEF': ''
             },
         )
 
@@ -2034,7 +2035,7 @@ class EnvTest(unittest.TestCase):
         }
         self.assertEqual(
             resolve_build_args(build),
-            {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2'},
+            {'arg1': 'value1', 'empty_arg': '', 'env_arg': 'value2', 'no_env': ''},
         )
 
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason='paths use slash')