Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
01c39eb2
Commit
01c39eb2
authored
Mar 24, 2022
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: Fix super usage
parent
f4872dcf
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
software/kvm/test/test.py
software/kvm/test/test.py
+6
-6
No files found.
software/kvm/test/test.py
View file @
01c39eb2
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment