diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-02-04 13:21:57 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-02-04 13:21:57 +0000 |
commit | a9f71e5e13aae0ad5088874283a817ae4927d7f7 (patch) | |
tree | a8403e1aca2e96b14ef5ac6e95939c8d1bd8e05c | |
parent | 4927e4d4c8dad97431af51fc42fed5f6f0989b69 (diff) | |
parent | e319a7f4854ca04adafb015660ca7c09c509e3ef (diff) | |
download | tempest-lib-a9f71e5e13aae0ad5088874283a817ae4927d7f7.tar.gz |
Merge "Separate Forbidden exception from Unauthorized"
-rw-r--r-- | tempest_lib/common/rest_client.py | 5 | ||||
-rw-r--r-- | tempest_lib/exceptions.py | 4 | ||||
-rw-r--r-- | tempest_lib/tests/test_rest_client.py | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tempest_lib/common/rest_client.py b/tempest_lib/common/rest_client.py index 683efa5..aa003bd 100644 --- a/tempest_lib/common/rest_client.py +++ b/tempest_lib/common/rest_client.py @@ -423,9 +423,12 @@ class RestClient(object): else: raise exceptions.InvalidContentType(str(resp.status)) - if resp.status == 401 or resp.status == 403: + if resp.status == 401: raise exceptions.Unauthorized(resp_body) + if resp.status == 403: + raise exceptions.Forbidden(resp_body) + if resp.status == 404: raise exceptions.NotFound(resp_body) diff --git a/tempest_lib/exceptions.py b/tempest_lib/exceptions.py index d97d158..fbf9ee0 100644 --- a/tempest_lib/exceptions.py +++ b/tempest_lib/exceptions.py @@ -62,6 +62,10 @@ class Unauthorized(RestClientException): message = 'Unauthorized' +class Forbidden(RestClientException): + message = "Forbidden" + + class TimeoutException(RestClientException): message = "Request timed out" diff --git a/tempest_lib/tests/test_rest_client.py b/tempest_lib/tests/test_rest_client.py index dc819d0..b48c156 100644 --- a/tempest_lib/tests/test_rest_client.py +++ b/tempest_lib/tests/test_rest_client.py @@ -315,7 +315,7 @@ class TestRestClientErrorCheckerJSON(base.TestCase): **self.set_data("401")) def test_response_403(self): - self.assertRaises(exceptions.Unauthorized, + self.assertRaises(exceptions.Forbidden, self.rest_client._error_checker, **self.set_data("403")) |