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
Xavier Thompson
slapos
Commits
f4872dcf
Commit
f4872dcf
authored
Mar 17, 2022
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: flak8ize test
parent
8a172d3c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
10 deletions
+18
-10
software/kvm/test/test.py
software/kvm/test/test.py
+18
-10
No files found.
software/kvm/test/test.py
View file @
f4872dcf
...
@@ -455,8 +455,8 @@ class TestAccessDefaultBootstrap(MonitorAccessMixin, InstanceTestCase):
...
@@ -455,8 +455,8 @@ class TestAccessDefaultBootstrap(MonitorAccessMixin, InstanceTestCase):
self
.
slap
.
waitForInstance
(
max_retry
=
10
)
self
.
slap
.
waitForInstance
(
max_retry
=
10
)
# END: mock .slapos-resource with tap.ipv4_addr
# END: mock .slapos-resource with tap.ipv4_addr
c
onnection_parameter_dict
=
self
.
computer_partition
\
c
p
=
self
.
computer_partition
.
getConnectionParameterDict
()
connection_parameter_dict
=
cp
.
getConnectionParameterDict
()
result
=
requests
.
get
(
connection_parameter_dict
[
'url'
],
verify
=
False
)
result
=
requests
.
get
(
connection_parameter_dict
[
'url'
],
verify
=
False
)
self
.
assertEqual
(
self
.
assertEqual
(
...
@@ -887,7 +887,8 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
...
@@ -887,7 +887,8 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
self
.
slap
.
waitForInstance
(
max_retry
=
10
)
self
.
slap
.
waitForInstance
(
max_retry
=
10
)
super
(
InstanceTestCase
,
self
).
tearDown
()
super
(
InstanceTestCase
,
self
).
tearDown
()
def
getRunningImageList
(
self
,
kvm_instance_partition
,
def
getRunningImageList
(
self
,
kvm_instance_partition
,
_match_cdrom
=
re
.
compile
(
'file=(.+),media=cdrom$'
).
match
,
_match_cdrom
=
re
.
compile
(
'file=(.+),media=cdrom$'
).
match
,
_sub_iso
=
re
.
compile
(
r'(/debian)(-[^-/]+)(-[^/]+-netinst\
.iso)$
').sub,
_sub_iso
=
re
.
compile
(
r'(/debian)(-[^-/]+)(-[^/]+-netinst\
.iso)$
').sub,
):
):
...
@@ -902,8 +903,10 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
...
@@ -902,8 +903,10 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
if m:
if m:
path = m.group(1)
path = m.group(1)
image_list.append(
image_list.append(
_sub_iso(r'
\
1
-
$
{
ver
}
\
3
',
_sub_iso(
sub_shared(r'
$
{
shared
}
/
',
r'
\
1
-
$
{
ver
}
\
3
',
sub_shared(
r'
$
{
shared
}
/
',
path.replace(kvm_instance_partition, '
$
{
inst
}
')
path.replace(kvm_instance_partition, '
$
{
inst
}
')
)))
)))
return image_list
return image_list
...
@@ -1039,6 +1042,7 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
...
@@ -1039,6 +1042,7 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
@skipUnlessKvm
@skipUnlessKvm
class TestBootImageUrlListResilient(TestBootImageUrlList):
class TestBootImageUrlListResilient(TestBootImageUrlList):
kvm_instance_partition_reference = '
biul2
'
kvm_instance_partition_reference = '
biul2
'
@classmethod
@classmethod
def getInstanceSoftwareType(cls):
def getInstanceSoftwareType(cls):
return '
kvm
-
resilient
'
return '
kvm
-
resilient
'
...
@@ -1149,6 +1153,7 @@ class TestBootImageUrlSelect(TestBootImageUrlList):
...
@@ -1149,6 +1153,7 @@ class TestBootImageUrlSelect(TestBootImageUrlList):
@
skipUnlessKvm
@
skipUnlessKvm
class
TestBootImageUrlSelectResilient
(
TestBootImageUrlSelect
):
class
TestBootImageUrlSelectResilient
(
TestBootImageUrlSelect
):
kvm_instance_partition_reference
=
'bius2'
kvm_instance_partition_reference
=
'bius2'
@
classmethod
@
classmethod
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
'kvm-resilient'
return
'kvm-resilient'
...
@@ -1264,6 +1269,7 @@ class TestNatRulesKvmCluster(InstanceTestCase):
...
@@ -1264,6 +1269,7 @@ class TestNatRulesKvmCluster(InstanceTestCase):
__partition_reference__
=
'nrkc'
__partition_reference__
=
'nrkc'
nat_rules
=
[
"100"
,
"200"
,
"300"
]
nat_rules
=
[
"100"
,
"200"
,
"300"
]
@
classmethod
@
classmethod
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
'kvm-cluster'
return
'kvm-cluster'
...
@@ -1340,6 +1346,7 @@ class TestWhitelistFirewall(InstanceTestCase):
...
@@ -1340,6 +1346,7 @@ class TestWhitelistFirewall(InstanceTestCase):
@
skipUnlessKvm
@
skipUnlessKvm
class
TestWhitelistFirewallRequest
(
TestWhitelistFirewall
):
class
TestWhitelistFirewallRequest
(
TestWhitelistFirewall
):
whitelist_domains
=
'2.2.2.2 3.3.3.3
\
n
4.4.4.4'
whitelist_domains
=
'2.2.2.2 3.3.3.3
\
n
4.4.4.4'
@
classmethod
@
classmethod
def
getInstanceParameterDict
(
cls
):
def
getInstanceParameterDict
(
cls
):
return
{
return
{
...
@@ -1704,6 +1711,7 @@ class TestParameterDefault(InstanceTestCase, KvmMixin):
...
@@ -1704,6 +1711,7 @@ class TestParameterDefault(InstanceTestCase, KvmMixin):
@
skipUnlessKvm
@
skipUnlessKvm
class
TestParameterResilient
(
TestParameterDefault
):
class
TestParameterResilient
(
TestParameterDefault
):
__partition_reference__
=
'pr'
__partition_reference__
=
'pr'
@
classmethod
@
classmethod
def
getInstanceSoftwareType
(
cls
):
def
getInstanceSoftwareType
(
cls
):
return
'kvm-resilient'
return
'kvm-resilient'
...
...
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