diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-14 08:08:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-14 08:08:43 +0000 |
| commit | dbc8e82b84c2f71cb4ab5eecc135b556b449e9b7 (patch) | |
| tree | dc49d525eef86120afee7c66e94dfe8ef24e87db | |
| parent | afb3e83f3d29b40524084437c3f3aa7a026272b2 (diff) | |
| parent | a7f3d99be36921dc8021c472f2a6f06eca49c579 (diff) | |
| download | tempest-dbc8e82b84c2f71cb4ab5eecc135b556b449e9b7.tar.gz | |
Merge "Add exceptions.BadRequest to the test case of reserve_fixed_ip"
| -rw-r--r-- | tempest/api/compute/admin/test_fixed_ips_negative.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tempest/api/compute/admin/test_fixed_ips_negative.py b/tempest/api/compute/admin/test_fixed_ips_negative.py index 90be8201b..8d6a7fcfb 100644 --- a/tempest/api/compute/admin/test_fixed_ips_negative.py +++ b/tempest/api/compute/admin/test_fixed_ips_negative.py @@ -68,7 +68,10 @@ class FixedIPsNegativeTestJson(base.BaseV2ComputeAdminTest): # NOTE(maurosr): since this exercises the same code snippet, we do it # only for reserve action body = {"reserve": "None"} - self.assertRaises(exceptions.NotFound, + # NOTE(eliqiao): in Juno, the exception is NotFound, but in master, we + # change the error code to BadRequest, both exceptions should be + # accepted by tempest + self.assertRaises((exceptions.NotFound, exceptions.BadRequest), self.client.reserve_fixed_ip, "my.invalid.ip", body) |