Merge pull request #183 from tomviner/verbose-post-bug

Verbose post bug
cdent · Nov 4, 2016 · f30fe24 · f30fe24
2 parents 3909528 + 723d49f
commit f30fe24
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/gabbi/case.py b/gabbi/case.py
@@ -360,7 +360,7 @@ def _run_test(self):
                 raise exception.GabbiFormatError(
                     'malformed headers in test %s: %s' % (test['name'], exc))
 
-        if test['data'] is not '':
+        if test['data'] != '':
             body = self._test_data_to_string(
                 test['data'],
                 utils.extract_content_type(headers, default='')[0])

diff --git a/gabbi/tests/test_verbose.yaml b/gabbi/tests/test_verbose.yaml
@@ -0,0 +1,9 @@
+tests:
+
+  - name: POST data with verbose true
+    verbose: true
+    POST: /
+    request_headers:
+        content-type: application/json
+    data:
+        'text'
diff --git a/gabbi/utils.py b/gabbi/utils.py
@@ -15,6 +15,7 @@
 import io
 import os
 
+import six
 import yaml
 
 
@@ -62,7 +63,7 @@ def decode_response_content(header_dict, content):
     """Decode content to a proper string."""
     content_type, charset = extract_content_type(header_dict)
 
-    if not_binary(content_type):
+    if not_binary(content_type) and isinstance(content, six.binary_type):
         return content.decode(charset)
     else:
         return content