From d8e390eb9fd843d2d232ba08bae02381e1236e54 Mon Sep 17 00:00:00 2001
From: Michael Irwin <mikesir87@gmail.com>
Date: Tue, 5 Mar 2019 22:18:22 -0500
Subject: [PATCH] Added test case to verify fix for #6525

Signed-off-by: Michael Irwin <mikesir87@gmail.com>
---
 tests/unit/config/config_test.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py
index d9d8496af..e27427ca5 100644
--- a/tests/unit/config/config_test.py
+++ b/tests/unit/config/config_test.py
@@ -3970,6 +3970,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: {