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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos
Commits
97c3a8e6
Commit
97c3a8e6
authored
Sep 04, 2018
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jstestnode: use XORG_LOCK_DIR
replace slapos.recipe:xvfb by a simple wrapper
parent
1e0fbe66
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
12 deletions
+16
-12
software/jstestnode/buildout.hash.cfg
software/jstestnode/buildout.hash.cfg
+2
-2
software/jstestnode/instance.cfg.in
software/jstestnode/instance.cfg.in
+12
-8
software/jstestnode/runTestSuite.in
software/jstestnode/runTestSuite.in
+2
-2
No files found.
software/jstestnode/buildout.hash.cfg
View file @
97c3a8e6
...
...
@@ -15,7 +15,7 @@
[instance]
filename = instance.cfg.in
md5sum = 7
c907db5f803b03a218b49888a3a3799
md5sum = 7
4d4c0a5105fa3d74af894fa1afa9ba2
[template-nginx-service]
filename = template-nginx-service.sh.in
...
...
@@ -27,4 +27,4 @@ md5sum = 9f22db89a2679534aa8fd37dbca86782
[template-runTestSuite]
filename = runTestSuite.in
md5sum =
af6985e2192b43b5b1dfd37bb538df72
md5sum =
d26572727ef1679a8a9e51b021ece524
software/jstestnode/instance.cfg.in
View file @
97c3a8e6
...
...
@@ -39,15 +39,19 @@ buildout-directory = $${buildout:directory}
mode = 0700
[xvfb-instance]
recipe = slapos.cookbook:xvfb
runner-path = $${directory:services}/xvfb
xvfb-path = ${xserver:location}/bin/Xvfb
fbdir-path = $${directory:framebuffer}
tmp-path = $${directory:run}
shell-path = ${dash:location}/bin/dash
recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:services}/$${:_buildout_section_name_}
command-line =
${xserver:location}/bin/Xvfb
$${:display}
-screen 0 1024x768x24
-fbdir $${directory:framebuffer}
environment =
XORG_LOCK_DIR=$${:lock-dir}
display = :0
lock-dir = $${directory:run}
xwd-path = ${xwd:location}/bin/xwd
xwd-hook-path = $${directory:bin}/xwd
#################################
# Nginx service
...
...
software/jstestnode/runTestSuite.in
View file @
97c3a8e6
...
...
@@ -15,8 +15,8 @@ from selenium.webdriver.support import expected_conditions as EC
from subprocess import check_output
import json
os.environ['
TMPDIR'] = '$${xvfb-instance:tmp-path
}'
os.environ['DISPLAY'] = '
:0
'
os.environ['
XORG_LOCK_DIR'] = '$${xvfb-instance:lock-dir
}'
os.environ['DISPLAY'] = '
$${xvfb-instance:display}
'
BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/'
...
...
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