summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-05 18:57:33 +0000
committerGerrit Code Review <review@openstack.org>2012-07-05 18:57:33 +0000
commit4e4ec8178e6667f5e9eb7d92d9c014fc51686201 (patch)
treebcc24c8bbfebcb7dc23b538ce115d484651fdf66 /nova
parent563b160071b794217c988f5fd13bccffe4996f86 (diff)
parentef7462c28ebbc0b8e36c9663acab820121e5f747 (diff)
downloadnova-4e4ec8178e6667f5e9eb7d92d9c014fc51686201.tar.gz
nova-4e4ec8178e6667f5e9eb7d92d9c014fc51686201.tar.xz
nova-4e4ec8178e6667f5e9eb7d92d9c014fc51686201.zip
Merge "Remove unnecessary setUp() method in xenapi driver tests"
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/test_xenapi.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index dee976403..83b0c6a37 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -1074,17 +1074,6 @@ class XenAPIImageTypeTestCase(test.TestCase):
class XenAPIDetermineDiskImageTestCase(test.TestCase):
"""Unit tests for code that detects the ImageType."""
- def setUp(self):
- super(XenAPIDetermineDiskImageTestCase, self).setUp()
-
- class FakeInstance(object):
- pass
-
- self.fake_instance = FakeInstance()
- self.fake_instance.id = 42
- self.fake_instance.os_type = 'linux'
- self.fake_instance.architecture = 'x86-64'
-
def assert_disk_type(self, image_meta, expected_disk_type):
actual = vm_utils.determine_disk_image_type(image_meta)
self.assertEqual(expected_disk_type, actual)