summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/image/test_s3.py4
-rw-r--r--nova/tests/test_exception.py8
-rw-r--r--nova/tests/test_libvirt.py4
-rw-r--r--nova/tests/test_signer.py8
-rw-r--r--nova/tests/test_utils.py22
-rw-r--r--nova/tests/test_volume.py2
-rw-r--r--nova/tests/test_xenapi.py2
-rw-r--r--nova/tests/volume/test_HpSanISCSIDriver.py2
8 files changed, 22 insertions, 30 deletions
diff --git a/nova/tests/image/test_s3.py b/nova/tests/image/test_s3.py
index 2a9d279f4..637acc36e 100644
--- a/nova/tests/image/test_s3.py
+++ b/nova/tests/image/test_s3.py
@@ -134,9 +134,9 @@ class TestS3ImageService(test.TestCase):
self.assertEqual(block_device_mapping, expected_bdm)
def test_s3_malicious_tarballs(self):
- self.assertRaises(exception.Error,
+ self.assertRaises(exception.NovaException,
self.image_service._test_for_malicious_tarball,
"/unused", os.path.join(os.path.dirname(__file__), 'abs.tar.gz'))
- self.assertRaises(exception.Error,
+ self.assertRaises(exception.NovaException,
self.image_service._test_for_malicious_tarball,
"/unused", os.path.join(os.path.dirname(__file__), 'rel.tar.gz'))
diff --git a/nova/tests/test_exception.py b/nova/tests/test_exception.py
index 34f4f1829..31ca1a868 100644
--- a/nova/tests/test_exception.py
+++ b/nova/tests/test_exception.py
@@ -56,10 +56,6 @@ def good_function():
return 99
-def bad_function_error():
- raise exception.Error()
-
-
def bad_function_exception(blah="a", boo="b", context=None):
raise test.TestingException()
@@ -69,10 +65,6 @@ class WrapExceptionTestCase(test.TestCase):
wrapped = exception.wrap_exception()
self.assertEquals(99, wrapped(good_function)())
- def test_wrap_exception_throws_error(self):
- wrapped = exception.wrap_exception()
- self.assertRaises(exception.Error, wrapped(bad_function_error))
-
def test_wrap_exception_throws_exception(self):
wrapped = exception.wrap_exception()
self.assertRaises(test.TestingException,
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 24c992714..2391ea1ea 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -1193,8 +1193,8 @@ class LibvirtConnTestCase(test.TestCase):
conn.ensure_filtering_rules_for_instance(instance_ref,
network_info,
time=fake_timer)
- except exception.Error, e:
- c1 = (0 <= e.message.find('Timeout migrating for'))
+ except exception.NovaException, e:
+ c1 = (0 <= str(e).find('Timeout migrating for'))
self.assertTrue(c1)
self.assertEqual(29, fake_timer.counter, "Didn't wait the expected "
diff --git a/nova/tests/test_signer.py b/nova/tests/test_signer.py
index 3fcac7f22..7c24f2443 100644
--- a/nova/tests/test_signer.py
+++ b/nova/tests/test_signer.py
@@ -65,14 +65,14 @@ class SignerTestCase(test.TestCase):
'GET', 'server', '/foo'))
def test_generate_invalid_signature_method_defined(self):
- self.assertRaises(exception.Error,
+ self.assertRaises(exception.NovaException,
self.signer.generate,
{'SignatureVersion': '2',
'SignatureMethod': 'invalid_method'},
'GET', 'server', '/foo')
def test_generate_no_signature_method_defined(self):
- self.assertRaises(exception.Error,
+ self.assertRaises(exception.NovaException,
self.signer.generate,
{'SignatureVersion': '2'},
'GET', 'server', '/foo')
@@ -85,7 +85,7 @@ class SignerTestCase(test.TestCase):
# Create Signer again now that hashlib.sha256 is None
self.signer = signer.Signer(
'uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o')
- self.assertRaises(exception.Error,
+ self.assertRaises(exception.NovaException,
self.signer.generate,
{'SignatureVersion': '2',
'SignatureMethod': 'HmacSHA256'},
@@ -106,7 +106,7 @@ class SignerTestCase(test.TestCase):
'GET', 'server', '/foo'))
def test_generate_unknown_version(self):
- self.assertRaises(exception.Error,
+ self.assertRaises(exception.NovaException,
self.signer.generate,
{'SignatureMethod': 'HmacSHA256', 'SignatureVersion': '9'},
'GET', 'server', '/foo')
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 86717eb33..a8de63449 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -87,7 +87,7 @@ exit 1
os.unlink(tmpfilename2)
def test_unknown_kwargs_raises_error(self):
- self.assertRaises(exception.Error,
+ self.assertRaises(exception.NovaException,
utils.execute,
'/usr/bin/env', 'true',
this_is_not_a_valid_kwarg=True)
@@ -229,16 +229,16 @@ class GetFromPathTestCase(test.TestCase):
def test_bad_xpath(self):
f = utils.get_from_path
- self.assertRaises(exception.Error, f, [], None)
- self.assertRaises(exception.Error, f, [], "")
- self.assertRaises(exception.Error, f, [], "/")
- self.assertRaises(exception.Error, f, [], "/a")
- self.assertRaises(exception.Error, f, [], "/a/")
- self.assertRaises(exception.Error, f, [], "//")
- self.assertRaises(exception.Error, f, [], "//a")
- self.assertRaises(exception.Error, f, [], "a//a")
- self.assertRaises(exception.Error, f, [], "a//a/")
- self.assertRaises(exception.Error, f, [], "a/a/")
+ self.assertRaises(exception.NovaException, f, [], None)
+ self.assertRaises(exception.NovaException, f, [], "")
+ self.assertRaises(exception.NovaException, f, [], "/")
+ self.assertRaises(exception.NovaException, f, [], "/a")
+ self.assertRaises(exception.NovaException, f, [], "/a/")
+ self.assertRaises(exception.NovaException, f, [], "//")
+ self.assertRaises(exception.NovaException, f, [], "//a")
+ self.assertRaises(exception.NovaException, f, [], "a//a")
+ self.assertRaises(exception.NovaException, f, [], "a//a/")
+ self.assertRaises(exception.NovaException, f, [], "a/a/")
def test_real_failure1(self):
# Real world failure case...
diff --git a/nova/tests/test_volume.py b/nova/tests/test_volume.py
index ece04f89f..27969ee5b 100644
--- a/nova/tests/test_volume.py
+++ b/nova/tests/test_volume.py
@@ -195,7 +195,7 @@ class VolumeTestCase(test.TestCase):
instance_ref = db.volume_get_instance(self.context, volume_id)
self.assertEqual(instance_ref['id'], instance_id)
- self.assertRaises(exception.Error,
+ self.assertRaises(exception.NovaException,
self.volume.delete_volume,
self.context,
volume_id)
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 4c1addeaf..eef60dd94 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -304,7 +304,7 @@ class XenAPIVMTestCase(test.TestCase):
instance = self._create_instance()
name = "MySnapshot"
- self.assertRaises(exception.Error, self.conn.snapshot,
+ self.assertRaises(exception.NovaException, self.conn.snapshot,
self.context, instance, name)
def test_instance_snapshot(self):
diff --git a/nova/tests/volume/test_HpSanISCSIDriver.py b/nova/tests/volume/test_HpSanISCSIDriver.py
index 467c5d728..43ed3e019 100644
--- a/nova/tests/volume/test_HpSanISCSIDriver.py
+++ b/nova/tests/volume/test_HpSanISCSIDriver.py
@@ -208,5 +208,5 @@ class HpSanISCSITestCase(test.TestCase):
def test_cliq_error(self):
try:
self.driver._cliq_run_xml("testError", {})
- except exception.Error:
+ except exception.NovaException:
pass
generated by cgit (git 2.34.1) at 2026-04-19 11:38:03 +0000