From ba249e51796e6b35ed13e5f03716a9520a2dacfc Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Wed, 9 Nov 2016 15:10:02 +0000
Subject: [PATCH] Test that values in 'environment' override env files

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 tests/unit/config/config_test.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index 66ae01474..51c5e226b 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -2493,6 +2493,15 @@ class EnvTest(unittest.TestCase):
             {'ONE': '2', 'TWO': '1', 'THREE': '3', 'FOO': 'bar'},
         )
 
+    def test_environment_overrides_env_file(self):
+        self.assertEqual(
+            resolve_environment({
+                'environment': {'FOO': 'baz'},
+                'env_file': ['tests/fixtures/env/one.env'],
+            }),
+            {'ONE': '2', 'TWO': '1', 'THREE': '3', 'FOO': 'baz'},
+        )
+
     def test_resolve_environment_with_multiple_env_files(self):
         service_dict = {
             'env_file': [