Merge pull request #2878 from dnephin/merge_build_args

Merge build.args when merging services
2016-02-11 17:41:41 +00:00 · 2016-02-11 17:41:41 +00:00 · 23ab2c7e44
commit 23ab2c7e44
parent b8f7bbb84e 37564a73c3
2 changed files with 45 additions and 17 deletions
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@ -1079,6 +1079,39 @@ class ConfigTest(unittest.TestCase):
            'extends': {'service': 'foo'}
        }

+    def test_merge_build_args(self):
+        base = {
+            'build': {
+                'context': '.',
+                'args': {
+                    'ONE': '1',
+                    'TWO': '2',
+                },
+            }
+        }
+        override = {
+            'build': {
+                'args': {
+                    'TWO': 'dos',
+                    'THREE': '3',
+                },
+            }
+        }
+        actual = config.merge_service_dicts(
+            base,
+            override,
+            DEFAULT_VERSION)
+        assert actual == {
+            'build': {
+                'context': '.',
+                'args': {
+                    'ONE': '1',
+                    'TWO': 'dos',
+                    'THREE': '3',
+                },
+            }
+        }
+
    def test_external_volume_config(self):
        config_details = build_config_details({
            'version': '2',