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
zhifan huang
slapos
Commits
e4e53f72
Commit
e4e53f72
authored
Apr 05, 2022
by
zhifan huang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update re6stnet eggs set
parent
ef42ca00
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
software/re6stnet/buildout.hash.cfg
software/re6stnet/buildout.hash.cfg
+1
-1
software/re6stnet/run-unit-test.in
software/re6stnet/run-unit-test.in
+3
-3
software/re6stnet/software.cfg
software/re6stnet/software.cfg
+4
-2
No files found.
software/re6stnet/buildout.hash.cfg
View file @
e4e53f72
...
@@ -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 = 1
8d4d656984ae2c99f56064b1e727bcb
md5sum = 1
6931ef5f1a4667b3fad8bed7b043c18
software/re6stnet/run-unit-test.in
View file @
e4e53f72
...
@@ -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)
...
...
software/re6stnet/software.cfg
View file @
e4e53f72
...
@@ -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
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