Merge lp:~pedronis/u1db/parse-sync-stream-buglet into lp:u1db

[Samuele Pedroni]

[trivial] test and fix for small issue in _parse_sync_stream with a broken stream

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'u1db/remote/http_target.py'
--- u1db/remote/http_target.py	2012-08-14 14:31:45 +0000
+++ u1db/remote/http_target.py	2012-09-20 17:29:36 +0000
@@ -60,6 +60,7 @@
         if not parts or parts[0] != '[':
             raise BrokenSyncStream
         data = parts[1:-1]
+        comma = False
         if data:
             line, comma = utils.check_and_strip_comma(data[0])
             res = json.loads(line)
@@ -79,7 +80,7 @@
                 if isinstance(partdic, dict):
                     self._error(partdic)
             raise BrokenSyncStream
-        if comma:  # bad extra comma
+        if not data or comma:  # no entries or bad extra comma
             raise BrokenSyncStream
         return res
 

=== modified file 'u1db/tests/test_remote_sync_target.py'
--- u1db/tests/test_remote_sync_target.py	2012-09-04 13:45:35 +0000
+++ u1db/tests/test_remote_sync_target.py	2012-09-20 17:29:36 +0000
@@ -72,6 +72,12 @@
                           '[\r\n{}\r\n{"id": "i", "rev": "r", '
                           '"content": "c", "gen": 3}\r\n]', None)
 
+    def test_no_entries(self):
+        tgt = http_target.HTTPSyncTarget("http://foo/foo")
+
+        self.assertRaises(errors.BrokenSyncStream,
+                          tgt._parse_sync_stream, "[\r\n]", None)
+
     def test_extra_comma(self):
         tgt = http_target.HTTPSyncTarget("http://foo/foo")