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
Leo Le Bouter
slapos
Commits
99356261
Commit
99356261
authored
Dec 30, 2019
by
Bryton Lacquement
🚪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: new software release targeting Python 3
parent
0d3d672b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
software/kvm/software-py3.cfg
software/kvm/software-py3.cfg
+10
-0
software/kvm/test/setup.py
software/kvm/test/setup.py
+1
-0
software/kvm/test/test.py
software/kvm/test/test.py
+3
-1
No files found.
software/kvm/software-py3.cfg
0 → 100644
View file @
99356261
[buildout]
extends =
../../component/python3/buildout.cfg
software.cfg
python = python3
# Ignore these for now
common-parts -=
rdiff-backup
software/kvm/test/setup.py
View file @
99356261
...
@@ -47,6 +47,7 @@ setup(name=name,
...
@@ -47,6 +47,7 @@ setup(name=name,
'erp5.util'
,
'erp5.util'
,
'supervisor'
,
'supervisor'
,
'psutil'
,
'psutil'
,
'six'
,
],
],
zip_safe
=
True
,
zip_safe
=
True
,
test_suite
=
'test'
,
test_suite
=
'test'
,
...
...
software/kvm/test/test.py
View file @
99356261
...
@@ -29,6 +29,7 @@ import httplib
...
@@ -29,6 +29,7 @@ import httplib
import
json
import
json
import
os
import
os
import
requests
import
requests
import
six
import
slapos.util
import
slapos.util
import
sqlite3
import
sqlite3
import
urlparse
import
urlparse
...
@@ -43,7 +44,8 @@ skipUnlessKvm = unittest.skipUnless(has_kvm, 'kvm not loaded or not allowed')
...
@@ -43,7 +44,8 @@ skipUnlessKvm = unittest.skipUnless(has_kvm, 'kvm not loaded or not allowed')
if
has_kvm
:
if
has_kvm
:
setUpModule
,
InstanceTestCase
=
makeModuleSetUpAndTestCaseClass
(
setUpModule
,
InstanceTestCase
=
makeModuleSetUpAndTestCaseClass
(
os
.
path
.
abspath
(
os
.
path
.
abspath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'..'
,
'software.cfg'
)))
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'..'
,
'software%s.cfg'
%
(
"-py3"
if
six
.
PY3
else
""
))))
else
:
else
:
setUpModule
,
InstanceTestCase
=
None
,
unittest
.
TestCase
setUpModule
,
InstanceTestCase
=
None
,
unittest
.
TestCase
...
...
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