Extend test to make sure that by default no mime-type is specified.
authorThomi Richards <thomi.richards@canonical.com>
Mon, 18 Nov 2013 22:01:15 +0000 (11:01 +1300)
committerThomi Richards <thomi.richards@canonical.com>
Mon, 18 Nov 2013 22:01:15 +0000 (11:01 +1300)
python/subunit/_output.py
python/subunit/tests/test_output_filter.py

index 43097e6..b4df54c 100644 (file)
@@ -117,19 +117,22 @@ def generate_bytestream(args, output_writer):
     output_writer.stopTestRun()
 
 
-def write_chunked_file(file_obj, test_id, output_writer, chunk_size=1024):
+def write_chunked_file(file_obj, test_id, output_writer, chunk_size=1024,
+    mime_type=None):
     reader = partial(file_obj.read, chunk_size)
     for chunk in iter(reader, ''):
         output_writer.status(
             test_id=test_id,
             file_name=file_obj.name,
             file_bytes=chunk,
+            mime_type=mime_type,
             eof=False,
         )
     output_writer.status(
             test_id=test_id,
             file_name=file_obj.name,
             file_bytes='',
+            mime_type=mime_type,
             eof=True,
         )
 
index 9d530c5..ef6dc9a 100644 (file)
@@ -216,12 +216,12 @@ class FileChunkingTests(TestCase):
         self.assertThat(
             result._events,
             MatchesListwise([
-                MatchesCall(call='status', file_bytes='H', eof=False),
-                MatchesCall(call='status', file_bytes='e', eof=False),
-                MatchesCall(call='status', file_bytes='l', eof=False),
-                MatchesCall(call='status', file_bytes='l', eof=False),
-                MatchesCall(call='status', file_bytes='o', eof=False),
-                MatchesCall(call='status', file_bytes='', eof=True),
+                MatchesCall(call='status', file_bytes='H', mime_type=None, eof=False),
+                MatchesCall(call='status', file_bytes='e', mime_type=None, eof=False),
+                MatchesCall(call='status', file_bytes='l', mime_type=None, eof=False),
+                MatchesCall(call='status', file_bytes='l', mime_type=None, eof=False),
+                MatchesCall(call='status', file_bytes='o', mime_type=None, eof=False),
+                MatchesCall(call='status', file_bytes='', mime_type=None, eof=True),
             ])
         )