Commit e4e53f72 authored by zhifan huang's avatar zhifan huang

update re6stnet eggs set

parent ef42ca00
...@@ -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 = 18d4d656984ae2c99f56064b1e727bcb md5sum = 16931ef5f1a4667b3fad8bed7b043c18
...@@ -54,14 +54,14 @@ def main(): ...@@ -54,14 +54,14 @@ def main():
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()
# result = out.replace("'", '"')
result= json.loads(out)
test_name_list = list(result)
# print to stdout so we can see in testnode logs # print to stdout so we can see in testnode logs
sys.stdout.write(out) sys.stdout.write(out)
sys.stderr.write(err) sys.stderr.write(err)
result= json.loads(out)
test_name_list = list(result)
if args.master_url: if args.master_url:
tool = taskdistribution.TaskDistributor(portal_url = args.master_url) tool = taskdistribution.TaskDistributor(portal_url = args.master_url)
......
...@@ -37,7 +37,7 @@ eggs = ...@@ -37,7 +37,7 @@ eggs =
${python-cffi:egg} ${python-cffi:egg}
${python-cryptography:egg} ${python-cryptography:egg}
pyOpenSSL pyOpenSSL
re6stnet[geoip] re6stnet[geoip, test]
initialization = initialization =
import os import os
path = os.environ.get('PATH', '/bin:/usr/bin') path = os.environ.get('PATH', '/bin:/usr/bin')
...@@ -104,6 +104,9 @@ context = ...@@ -104,6 +104,9 @@ context =
[versions] [versions]
miniupnpc = 1.9 miniupnpc = 1.9
nemu = 0.3.1
python-unshare = 0.2
passfd = 1.0.2
# No test suite for re6stnet for now. The revision is hardcoded. # No test suite for re6stnet for now. The revision is hardcoded.
...@@ -125,4 +128,3 @@ output = ${buildout:directory}/runTestSuite.in ...@@ -125,4 +128,3 @@ output = ${buildout:directory}/runTestSuite.in
[re6stnet] [re6stnet]
eggs += eggs +=
erp5.util erp5.util
mock
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