diff --git a/requirements.txt b/requirements.txt index 493e68906..89270fdb1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ PyJWT>=1.0.1 # MIT requests>=2.6.0 # Apache-2.0 Routes>=2.2 # MIT six>=1.9.0 # MIT -WebOb>=1.2.3,<1.8.0 # MIT +WebOb>=1.2.3 # MIT diff --git a/zvmsdk/sdkwsgi/util.py b/zvmsdk/sdkwsgi/util.py index b754e3888..a65566fdb 100644 --- a/zvmsdk/sdkwsgi/util.py +++ b/zvmsdk/sdkwsgi/util.py @@ -199,7 +199,7 @@ class SdkWsgify(wsgify): def call_func(self, req, *args, **kwargs): """Add json_error_formatter to any webob HTTPExceptions.""" try: - super(SdkWsgify, self).call_func(req, *args, **kwargs) + return super(SdkWsgify, self).call_func(req, *args, **kwargs) except webob.exc.HTTPException as exc: msg = ('encounter %(error)s error') % {'error': exc} LOG.debug(msg) @@ -215,4 +215,4 @@ def call_func(self, req, *args, **kwargs): 'output': '', 'errmsg': explanation} exc.text = six.text_type(json.dumps(fault_data)) - return exc + raise exc diff --git a/zvmsdk/tests/unit/sdkwsgi/handlers/test_guest.py b/zvmsdk/tests/unit/sdkwsgi/handlers/test_guest.py index 422b60945..ab298666e 100644 --- a/zvmsdk/tests/unit/sdkwsgi/handlers/test_guest.py +++ b/zvmsdk/tests/unit/sdkwsgi/handlers/test_guest.py @@ -359,7 +359,6 @@ def test_guest_invalid_action(self, mock_userid): self.req.body = '{"fake": "None"}' mock_userid.return_value = FAKE_USERID - self.assertRaises(webob.exc.HTTPBadRequest, guest.guest_action, self.req)