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
Léo-Paul Géneau
slapos
Commits
edb7a544
Commit
edb7a544
authored
Sep 16, 2020
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/kvm: Fix py3 test compatibility
parent
fe72c661
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
software/kvm/test/test.py
software/kvm/test/test.py
+2
-2
No files found.
software/kvm/test/test.py
View file @
edb7a544
...
@@ -592,7 +592,7 @@ class TestBootImageUrlList(InstanceTestCase):
...
@@ -592,7 +592,7 @@ class TestBootImageUrlList(InstanceTestCase):
kvm_process
=
psutil
.
Process
(
kvm_pid
)
kvm_process
=
psutil
.
Process
(
kvm_pid
)
software_root
=
'/'
.
join
([
software_root
=
'/'
.
join
([
self
.
slap
.
software_directory
,
self
.
slap
.
software_directory
,
hashlib
.
md5
(
self
.
getSoftwareURL
()).
hexdigest
()])
hashlib
.
md5
(
self
.
getSoftwareURL
()
.
encode
(
'utf-8'
)
).
hexdigest
()])
for
entry
in
kvm_process
.
cmdline
():
for
entry
in
kvm_process
.
cmdline
():
if
entry
.
startswith
(
'file'
)
and
'media=cdrom'
in
entry
:
if
entry
.
startswith
(
'file'
)
and
'media=cdrom'
in
entry
:
# do cleanups
# do cleanups
...
@@ -774,7 +774,7 @@ class TestBootImageUrlSelect(TestBootImageUrlList):
...
@@ -774,7 +774,7 @@ class TestBootImageUrlSelect(TestBootImageUrlList):
kvm_process
=
psutil
.
Process
(
kvm_pid
)
kvm_process
=
psutil
.
Process
(
kvm_pid
)
software_root
=
'/'
.
join
([
software_root
=
'/'
.
join
([
self
.
slap
.
software_directory
,
self
.
slap
.
software_directory
,
hashlib
.
md5
(
self
.
getSoftwareURL
()).
hexdigest
()])
hashlib
.
md5
(
self
.
getSoftwareURL
()
.
encode
(
'utf-8'
)
).
hexdigest
()])
for
entry
in
kvm_process
.
cmdline
():
for
entry
in
kvm_process
.
cmdline
():
if
entry
.
startswith
(
'file'
)
and
'media=cdrom'
in
entry
:
if
entry
.
startswith
(
'file'
)
and
'media=cdrom'
in
entry
:
# do cleanups
# do cleanups
...
...
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