Commit 01c39eb2 authored by Łukasz Nowak's avatar Łukasz Nowak

kvm: Fix super usage

parent f4872dcf
...@@ -870,11 +870,11 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin): ...@@ -870,11 +870,11 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.startImageHttpServer() cls.startImageHttpServer()
super(InstanceTestCase, cls).setUpClass() super(TestBootImageUrlList, cls).setUpClass()
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
super(InstanceTestCase, cls).tearDownClass() super(TestBootImageUrlList, cls).tearDownClass()
cls.stopImageHttpServer() cls.stopImageHttpServer()
def tearDown(self): def tearDown(self):
...@@ -885,7 +885,7 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin): ...@@ -885,7 +885,7 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
# 2nd ...move instance to "default" state # 2nd ...move instance to "default" state
self.rerequestInstance({}) self.rerequestInstance({})
self.slap.waitForInstance(max_retry=10) self.slap.waitForInstance(max_retry=10)
super(InstanceTestCase, self).tearDown() super(TestBootImageUrlList, self).tearDown()
def getRunningImageList( def getRunningImageList(
self, kvm_instance_partition, self, kvm_instance_partition,
...@@ -1172,12 +1172,12 @@ class TestBootImageUrlListKvmCluster(InstanceTestCase, FakeImageServerMixin): ...@@ -1172,12 +1172,12 @@ class TestBootImageUrlListKvmCluster(InstanceTestCase, FakeImageServerMixin):
config_file_name = 'boot-image-url-list.conf' config_file_name = 'boot-image-url-list.conf'
def setUp(self): def setUp(self):
super(InstanceTestCase, self).setUp() super(TestBootImageUrlListKvmCluster, self).setUp()
self.startImageHttpServer() self.startImageHttpServer()
def tearDown(self): def tearDown(self):
self.stopImageHttpServer() self.stopImageHttpServer()
super(InstanceTestCase, self).tearDown() super(TestBootImageUrlListKvmCluster, self).tearDown()
@classmethod @classmethod
def getInstanceParameterDict(cls): def getInstanceParameterDict(cls):
...@@ -1474,7 +1474,7 @@ class TestImageDownloadController(InstanceTestCase, FakeImageServerMixin): ...@@ -1474,7 +1474,7 @@ class TestImageDownloadController(InstanceTestCase, FakeImageServerMixin):
def tearDown(self): def tearDown(self):
self.stopImageHttpServer() self.stopImageHttpServer()
shutil.rmtree(self.working_directory) shutil.rmtree(self.working_directory)
super(InstanceTestCase, self).tearDown() super(TestImageDownloadController, self).tearDown()
def callImageDownloadController(self, *args): def callImageDownloadController(self, *args):
call_list = [sys.executable, self.image_download_controller] + list(args) call_list = [sys.executable, self.image_download_controller] + list(args)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment