Commit a014646d authored by Jérome Perrin's avatar Jérome Perrin

Reorganise more python2 / python3 test suites

See merge request nexedi/slapos!1249
parents e07c2bab 0243ef0c
Pipeline #23436 failed with stage
[python]
part = python2.7
# SlapOS software release to test zodbtools/ZODB4-py2 on Nexedi testing infrastructure.
[buildout]
extends =
test-zodb4.cfg
test-py2.cfg
# SlapOS software release to test zodbtools/ZODB4-wc2-py2 on Nexedi testing infrastructure.
[buildout]
extends =
test-zodb4-wc2.cfg
test-py2.cfg
# SlapOS software release to test zodbtools/ZODB4-wc2 on Nexedi testing infrastructure. # SlapOS software release to test zodbtools/ZODB4-wc2-py3 on Nexedi testing infrastructure.
[buildout] [buildout]
extends = test-common.cfg extends = test-common.cfg
......
# SlapOS software release to test zodbtools/ZODB4-py3 on Nexedi testing infrastructure.
[buildout]
extends = test-common.cfg
[ZODB]
major = 4
# SlapOS software release to test zodbtools/ZODB5-py2 on Nexedi testing infrastructure.
[buildout]
extends =
test-zodb5.cfg
test-py2.cfg
# SlapOS software release to test zodbtools/ZODB5 on Nexedi testing infrastructure. # SlapOS software release to test zodbtools/ZODB5-py3 on Nexedi testing infrastructure.
[buildout] [buildout]
extends = test-common.cfg extends = test-common.cfg
......
# SlapOS software release to test zodbtools on Nexedi testing infrastructure.
[buildout]
extends = test-common.cfg
...@@ -3,4 +3,4 @@ extends = ...@@ -3,4 +3,4 @@ extends =
software.cfg software.cfg
[python] [python]
part = python3 part = python2.7
...@@ -6,9 +6,6 @@ parts = ...@@ -6,9 +6,6 @@ parts =
slapos-cookbook slapos-cookbook
template template
[python]
part = python2.7
[slapos.buildout-repository] [slapos.buildout-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/slapos.buildout.git repository = https://lab.nexedi.com/nexedi/slapos.buildout.git
......
...@@ -5,7 +5,7 @@ This software release is used to run unit test of slapos eggs. ...@@ -5,7 +5,7 @@ This software release is used to run unit test of slapos eggs.
The approach is to use nxdtest test runner, which will run tests for each The approach is to use nxdtest test runner, which will run tests for each
projects, as described in `.nxdtest` file. projects, as described in `.nxdtest` file.
The results of this test suite running on Nexedi ERP5 are published as The results of this test suite running on Nexedi ERP5 are published as
`SlapOS.Eggs.UnitTest-Master.Python3` and `SlapOS.Eggs.UnitTest-Master.Python2`. `SlapOS.Eggs.UnitTest-Master.Python3` and `SlapOS.Eggs.UnitTest-Master.Python2`.
...@@ -36,14 +36,14 @@ source ( environment script from step above ) ...@@ -36,14 +36,14 @@ source ( environment script from step above )
cd ~/srv/runner/instance/slappartXXX/parts/slapos.core/ cd ~/srv/runner/instance/slappartXXX/parts/slapos.core/
# make some changes to the code # make some changes to the code
vim slapos/tests/client.py $EDITOR slapos/tests/client.py
# run slapos.core tests # run slapos.core tests
runTestSuite --run slapos.core runTestSuite --run slapos.core
# ... or run all eggs tests # ... or run all eggs tests
runTestSuite runTestSuite
# when satified, commit changes # when satisfied, commit changes
git add -p && git commit git add -p && git commit
# add developer's fork remote (this is only needed the first time) # add developer's fork remote (this is only needed the first time)
......
...@@ -3,4 +3,4 @@ extends = ...@@ -3,4 +3,4 @@ extends =
software.cfg software.cfg
[python] [python]
part = python3 part = python2.7
...@@ -30,9 +30,6 @@ parts = ...@@ -30,9 +30,6 @@ parts =
phantomjs phantomjs
template template
[python]
part = python2.7
[bootstrap-slapos.recipe.cmmi] [bootstrap-slapos.recipe.cmmi]
# install our develop version of slapos.recipe.cmmi before anything else, # install our develop version of slapos.recipe.cmmi before anything else,
# otherwise it will be installed from pypi by dependencies. # otherwise it will be installed from pypi by dependencies.
......
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