Commit 3cfb3fcd authored by zhifan huang's avatar zhifan huang

change runtestsuite place

parent 64beeaf6
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 59d52b5e1d0d0beb907f8496b2c8187e md5sum = 171980fd96785dba72fa1af2f1edd1f1
[template-re6stnet] [template-re6stnet]
filename = instance-re6stnet.cfg.in filename = instance-re6stnet.cfg.in
...@@ -30,4 +30,4 @@ md5sum = feb4b3318f37414d1bf3d16a03aec93d ...@@ -30,4 +30,4 @@ md5sum = feb4b3318f37414d1bf3d16a03aec93d
[template-runTestSuite] [template-runTestSuite]
filename = run-unit-test.in filename = run-unit-test.in
md5sum = 3f55419497b7440200e4733ee4ffa6f6 md5sum = 39043b4a94159fe0846db1c5f44280e8
...@@ -54,7 +54,7 @@ RootSoftwareInstance = ${:default} ...@@ -54,7 +54,7 @@ RootSoftwareInstance = ${:default}
[runTestSuite-instance] [runTestSuite-instance]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = {{template_re6st_runTestSuite}} url = {{template_re6st_runTestSuite}}
output = {{ bin_directory }}/runTestSuite1231 output = ${buildout:directory}/bin/runTestSuite
python-executable = {{ python_with_eggs }} python-executable = {{ python_with_eggs }}
directory = ${buildout:directory} directory = ${buildout:directory}
mode = 0700 mode = 0700
...@@ -8,6 +8,9 @@ import time ...@@ -8,6 +8,9 @@ import time
from erp5.util import taskdistribution from erp5.util import taskdistribution
RUN_RE6ST_TESTS = "${buildout:bin-directory}" + "/re6st-testrunner"
class DummyTestResult: class DummyTestResult:
class DummyTestResultLine: class DummyTestResultLine:
...@@ -66,7 +69,7 @@ def main(): ...@@ -66,7 +69,7 @@ def main():
if not test_result_line: if not test_result_line:
break break
command = ["./re6st-testrunner"] command = [RUN_RE6ST_TESTS]
p = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, p = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
out, err = p.communicate() out, err = p.communicate()
......
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