Merge lp:~rye/python-oops-datedir-repo/empty-oops into lp:python-oops-datedir-repo

[Roman Yepishev]

This checks for length of the oops content before sending it to serializers.
OOPSes of 0 sizes signal about the problem with serializer, but they should not prevent oops loader from working properly.

[Robert Collins (lifeless)]

This looks fine modulo pep8 cosmetic stuff (trailing line in file, spurious VWS in the code, and also a missing NEWS entry. I'll add those and land it.

review: Approve

=== modified file 'oops_datedir_repo/serializer.py'
--- oops_datedir_repo/serializer.py	2011-11-11 04:21:05 +0000
+++ oops_datedir_repo/serializer.py	2011-11-25 09:30:28 +0000
@@ -48,6 +48,11 @@
     """
     # Deal with no-rewindable file pointers.
     content = fp.read()
+
+    if len(content) == 0:
+        # This OOPS has no content
+        raise IOError("Empty OOPS Report")
+
     try:
         return serializer_bson.read(StringIO(content))
     except KeyError:

=== modified file 'oops_datedir_repo/tests/test_serializer.py'
--- oops_datedir_repo/tests/test_serializer.py	2011-11-11 04:48:09 +0000
+++ oops_datedir_repo/tests/test_serializer.py	2011-11-25 09:30:28 +0000
@@ -67,3 +67,8 @@
         source_file.write(dumps(dict(self.source_dict)))
         source_file.seek(0)
         self.assertEqual(self.expected_dict, read(source_file))
+
+    def test_ioerror_on_empty_oops(self):
+        source_file = StringIO.StringIO()
+        self.assertRaises(IOError, read, source_file)
+