summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-17 06:46:36 +0000
committerGerrit Code Review <review@openstack.org>2018-08-17 06:46:36 +0000
commit004741968b290b4799c5fbda306ca81b495db896 (patch)
treefcc905da59992da0c0e088135ffe26294eed1684
parentcfb8531dc5512f0fe433f2cdec31d9cb3671d1b6 (diff)
parent18a208d5d14da2edc2da01b088cca362178daab2 (diff)
downloadoslo-vmware-004741968b290b4799c5fbda306ca81b495db896.tar.gz
Merge "py37: deal with Exception repr changes"
-rw-r--r--oslo_vmware/tests/test_exceptions.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/oslo_vmware/tests/test_exceptions.py b/oslo_vmware/tests/test_exceptions.py
index 419b769..2ef24a7 100644
--- a/oslo_vmware/tests/test_exceptions.py
+++ b/oslo_vmware/tests/test_exceptions.py
@@ -43,7 +43,8 @@ class ExceptionsTest(base.TestCase):
def test_vim_fault_exception(self):
vfe = exceptions.VimFaultException([ValueError("example")], _("cause"))
string = str(vfe)
- self.assertEqual("cause\nFaults: [ValueError('example',)]", string)
+ self.assertIn(string, ["cause\nFaults: [ValueError('example',)]",
+ "cause\nFaults: [ValueError('example')]"])
def test_vim_fault_exception_with_cause_and_details(self):
vfe = exceptions.VimFaultException([ValueError("example")],
@@ -51,11 +52,14 @@ class ExceptionsTest(base.TestCase):
"FooBar",
{'foo': 'bar'})
string = str(vfe)
- self.assertEqual("MyMessage\n"
- "Cause: FooBar\n"
- "Faults: [ValueError('example',)]\n"
- "Details: {'foo': 'bar'}",
- string)
+ self.assertIn(string, ["MyMessage\n"
+ "Cause: FooBar\n"
+ "Faults: [ValueError('example',)]\n"
+ "Details: {'foo': 'bar'}",
+ "MyMessage\n"
+ "Cause: FooBar\n"
+ "Faults: [ValueError('example')]\n"
+ "Details: {'foo': 'bar'}"])
def _create_subclass_exception(self):
class VimSubClass(exceptions.VimException):