Merge pull request #238 from cdent/fix-gnocchi

Raise GabbiFormatError when headers are None

gabbi/case.py

@@ -481,15 +481,15 @@ def _run_request(self, url, method, headers, body, redirect=False):
     def _replace_headers_template(self, test_name, headers):
         replaced_headers = {}
 
-        for name in headers:
-            try:
+        try:
+            for name in headers:
                 replaced_name = self.replace_template(name)
                 replaced_headers[replaced_name] = self.replace_template(
                     headers[name]
                 )
-            except TypeError as exc:
-                raise exception.GabbiFormatError(
-                    'malformed headers in test %s: %s' % (test_name, exc))
+        except TypeError as exc:
+            raise exception.GabbiFormatError(
+                'malformed headers in test %s: %s' % (test_name, exc))
 
         return replaced_headers
 

gabbi/tests/test_replacers.py

@@ -18,6 +18,7 @@
 import unittest
 
 from gabbi import case
+from gabbi import exception
 
 
 class EnvironReplaceTest(unittest.TestCase):
@@ -56,3 +57,13 @@ def test_environ_boolean(self):
 
         os.environ['moo'] = "True"
         self.assertEqual(True, http_case._environ_replace(message))
+
+
+class TestReplaceHeaders(unittest.TestCase):
+
+    def test_empty_headers(self):
+        """A None value in headers should cause a GabbiFormatError."""
+        http_case = case.HTTPTestCase('test_request')
+        self.assertRaises(
+                exception.GabbiFormatError,
+                http_case._replace_headers_template, 'foo', None)