Merge "Fix SLO test with old simplejson"

2014-07-01 21:11:52 +00:00
parent a40f671a12 12b81b2e61
commit 43a5dc20bd
1 changed files with 2 additions and 2 deletions
--- a/test/unit/common/middleware/test_slo.py
+++ b/test/unit/common/middleware/test_slo.py
@@ -821,8 +821,8 @@ class TestSloGetManifest(SloTestCase):
            headers)
        try:
            resp_data = json.loads(body)
-        except json.JSONDecodeError:
-            resp_data = None
+        except ValueError:
+            self.fail("Invalid JSON in manifest GET: %r" % body)

        self.assertEqual(
            resp_data,