Merge branch 'master' of python/django-test into production

apps/base/tests/test_views.py

@@ -28,8 +28,15 @@ class RootUnitTestCase(unittest.TestCase):
         real_hostname = socket.gethostname()
 
         for test_data in test_data_sets:
-            hostname = test_data.get('hostname', real_hostname)
+            if 'hostname' in test_data:
-            expected_color_hex = test_data.get('expected_color_hex', default_color_hex)
+                hostname = test_data['hostname']
+            else:
+                hostname = real_hostname
+
+            if 'expected_color_hex' in test_data:
+                expected_color_hex = test_data['expected_color_hex']
+            else:
+                expected_color_hex = default_color_hex
 
             with mock.patch('socket.gethostname', return_value=hostname):
                 view = RootView()