summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Irwin <mikesir87@gmail.com>2019-03-05 22:18:22 -0500
committerUlysses Souza <ulysses.souza@docker.com>2019-03-22 15:15:18 +0100
commit360753ecc17e7af637b031c7d1785b343e326ea6 (patch)
tree768c7753aeea9421bf3ac5ce80cd99c7861461f2
parent3fae0119ca2d1a05c490fdbf286370e92ce4a349 (diff)
Added test case to verify fix for #6525
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
-rw-r--r--tests/unit/config/config_test.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index c2e6b7b0..50d8e13a 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -3932,6 +3932,24 @@ class MergeNetworksTest(unittest.TestCase, MergeListsTest):
}
}
+ def test_network_has_none_value(self):
+ service_dict = config.merge_service_dicts(
+ {self.config_name: {
+ 'default': None
+ }},
+ {self.config_name: {
+ 'default': {
+ 'aliases': []
+ }
+ }},
+ DEFAULT_VERSION)
+
+ assert service_dict[self.config_name] == {
+ 'default': {
+ 'aliases': []
+ }
+ }
+
def test_all_properties(self):
service_dict = config.merge_service_dicts(
{self.config_name: {