From 3ba3cf22d612637583978f3b32e80cfa29161aa7 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 10 Aug 2015 18:27:15 +0100 Subject: bitbake: toaster: don't catch json.load exceptions It doesn't make sense to catch json.load exceptions in the testing code. If API throws traceback it's better to see it instead of error message. (Bitbake rev: 207cb1d16ab089995f23b6070be358870506aa62) Signed-off-by: Ed Bartosh Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/tests.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'bitbake/lib/toaster/toastergui/tests.py') diff --git a/bitbake/lib/toaster/toastergui/tests.py b/bitbake/lib/toaster/toastergui/tests.py index 1ed83dceda..723348dd57 100644 --- a/bitbake/lib/toaster/toastergui/tests.py +++ b/bitbake/lib/toaster/toastergui/tests.py @@ -82,10 +82,7 @@ class ViewTests(TestCase): self.assertEqual(response.status_code, 200) self.assertTrue(response['Content-Type'].startswith('application/json')) - try: - data = json.loads(response.content) - except: - self.fail("Response %s is not json-loadable" % response.content) + data = json.loads(response.content) self.assertTrue("error" in data) self.assertEqual(data["error"], "ok") @@ -113,10 +110,8 @@ class ViewTests(TestCase): self.assertEqual(response.status_code, 200) self.assertTrue(response['Content-Type'].startswith('application/json')) - try: - data = json.loads(response.content) - except: - self.fail("Response %s is not json-loadable" % response.content) + data = json.loads(response.content) + self.assertTrue("error" in data) self.assertEqual(data["error"], "ok") self.assertTrue("results" in data) -- cgit v1.2.3-54-g00ecf