aboutsummaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-08-10 18:27:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-10 13:58:01 -0700
commit3ba3cf22d612637583978f3b32e80cfa29161aa7 (patch)
treed2ecb01975c0028c611d6103cce2c490f5c8101d /bitbake
parentb3ab9b1211a49712bc703bbe018ad125fa9d8418 (diff)
downloadopenembedded-core-contrib-3ba3cf22d612637583978f3b32e80cfa29161aa7.tar.gz
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 <ed.bartosh@linux.intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/tests.py11
1 files changed, 3 insertions, 8 deletions
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)