summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 12:05:31 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 12:05:31 +0000
commit6030cd1ab67687212817c1615fd5a16c8780faf8 (patch)
treeff325a43733bc4827bf4ccf6d0f922f47e57176b
parent5480b1881331013be59a673216fd9e5e795b623a (diff)
parent15e9265ee473523b7080589f1fa87e084f0140af (diff)
Merge "Replace assertRaisesRegexp with assertRaisesRegex"
-rw-r--r--tripleoclient/tests/v1/baremetal/test_baremetal.py12
-rw-r--r--tripleoclient/tests/v1/test_overcloud_raid.py4
2 files changed, 8 insertions, 8 deletions
diff --git a/tripleoclient/tests/v1/baremetal/test_baremetal.py b/tripleoclient/tests/v1/baremetal/test_baremetal.py
index 8279074..1ec5f82 100644
--- a/tripleoclient/tests/v1/baremetal/test_baremetal.py
+++ b/tripleoclient/tests/v1/baremetal/test_baremetal.py
@@ -429,9 +429,9 @@ pxe_ssh,192.168.122.2,stack,"KEY2",00:0b:d0:69:7e:58,6230""")
429 ] 429 ]
430 self.baremetal.http_client.os_ironic_api_version = '1.6' 430 self.baremetal.http_client.os_ironic_api_version = '1.6'
431 parsed_args = self.check_parser(self.cmd, arglist, verifylist) 431 parsed_args = self.check_parser(self.cmd, arglist, verifylist)
432 self.assertRaisesRegexp(exceptions.InvalidConfiguration, 432 self.assertRaisesRegex(exceptions.InvalidConfiguration,
433 'OS_BAREMETAL_API_VERSION', 433 'OS_BAREMETAL_API_VERSION',
434 self.cmd.take_action, parsed_args) 434 self.cmd.take_action, parsed_args)
435 self.workflow.executions.create.assert_not_called() 435 self.workflow.executions.create.assert_not_called()
436 436
437 def test_json_import_detect_suffix(self): 437 def test_json_import_detect_suffix(self):
@@ -520,9 +520,9 @@ pxe_ssh,192.168.122.2,stack,"KEY2",00:0b:d0:69:7e:58,6230""")
520 520
521 parsed_args = self.check_parser(self.cmd, arglist, verifylist) 521 parsed_args = self.check_parser(self.cmd, arglist, verifylist)
522 522
523 self.assertRaisesRegexp(exceptions.InvalidConfiguration, 523 self.assertRaisesRegex(exceptions.InvalidConfiguration,
524 'Invalid file extension', 524 'Invalid file extension',
525 self.cmd.take_action, parsed_args) 525 self.cmd.take_action, parsed_args)
526 526
527 def test_instack_yaml_import(self): 527 def test_instack_yaml_import(self):
528 528
diff --git a/tripleoclient/tests/v1/test_overcloud_raid.py b/tripleoclient/tests/v1/test_overcloud_raid.py
index 2727549..a81eaa1 100644
--- a/tripleoclient/tests/v1/test_overcloud_raid.py
+++ b/tripleoclient/tests/v1/test_overcloud_raid.py
@@ -106,8 +106,8 @@ class TestCreateRAID(fakes.TestBaremetal):
106 ] 106 ]
107 parsed_args = self.check_parser(self.cmd, arglist, verifylist) 107 parsed_args = self.check_parser(self.cmd, arglist, verifylist)
108 108
109 self.assertRaisesRegexp(RuntimeError, 'cannot be parsed as YAML', 109 self.assertRaisesRegex(RuntimeError, 'cannot be parsed as YAML',
110 self.cmd.take_action, parsed_args) 110 self.cmd.take_action, parsed_args)
111 self.assertFalse(self.workflow.executions.create.called) 111 self.assertFalse(self.workflow.executions.create.called)
112 112
113 def test_bad_type(self): 113 def test_bad_type(self):