Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
preetwinder
erp5
Commits
f7f27d15
Commit
f7f27d15
authored
13 years ago
by
Ivan Tyagov
Browse files
Options
Download
Email Patches
Plain Diff
Try to check if X screen is available and fail loudly if it fails.
parent
a4194282
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
+12
-0
No files found.
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
View file @
f7f27d15
...
...
@@ -81,6 +81,18 @@ class Xvfb:
shell
=
True
,
close_fds
=
True
)
# try to check if X screen is available
time
.
sleep
(
5
)
check_process
=
Popen
(
'xdpyinfo -display %s >/dev/null 2>&1 && echo "Used" || echo "Free"'
%
display
,
stdout
=
PIPE
,
stderr
=
PIPE
,
shell
=
True
,
close_fds
=
True
)
result
=
check_process
.
communicate
()[
0
]
if
result
==
'Free'
:
# Xvfb did not start properly so stop here
raise
NotImplementedError
,
"Can not start Xvfb, stop test execution"
def
run
(
self
):
for
display_try
in
self
.
display_list
:
lock_filepath
=
'/tmp/.X%s-lock'
%
display_try
.
replace
(
":"
,
""
)
...
...
This diff is collapsed.
Click to expand it.
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