commit bb72f2e3fc9e8917ff6a712dea4366bf7134b80a
author Dmitry Tantsur <divius.inside@gmail.com> Fri Aug 04 12:35:37 2017 +0200
committer Dmitry Tantsur <divius.inside@gmail.com> Fri Aug 04 12:35:37 2017 +0200
tree 8ca684f9d3176e42dec293ef0bf4e5e19fefd74b
parent da89a414e055e39fa48a6e1676e1418db627d36b

[tempest] also catch BadRequest in negative tests with physical_network in old API

Before this field was introduced we would raise BadRequest (HTTP 400),
after - NotAcceptable (HTTP 406).

Check for any of the exceptions to allow branchless testing.

Change-Id: I3fafd4ef7f046a9195fc15f47f7fc967fb959550

ironic_tempest_plugin/tests/api/admin/test_ports_negative.py

diff --git a/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py b/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py
index 492c86c..c25020b 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py
@@ -354,7 +354,7 @@
         node_id = self.node['uuid']
         address = data_utils.rand_mac_address()
 
-        self.assertRaises(lib_exc.UnexpectedResponseCode,
+        self.assertRaises((lib_exc.BadRequest, lib_exc.UnexpectedResponseCode),
                           self.create_port,
                           node_id=node_id, address=address,
                           physical_network='physnet1')
@@ -371,7 +371,7 @@
                   'op': 'replace',
                   'value': new_physnet}]
 
-        self.assertRaises(lib_exc.UnexpectedResponseCode,
+        self.assertRaises((lib_exc.BadRequest, lib_exc.UnexpectedResponseCode),
                           self.client.update_port,
                           port['uuid'], patch)