projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: TimeoutExpired in Python tests not defined globally
[lttng-tools.git]
/
tests
/
regression
/
ust
/
linking
/
test_linking.py
diff --git
a/tests/regression/ust/linking/test_linking.py
b/tests/regression/ust/linking/test_linking.py
index 9591312935894bdf2fc22b3932ab8fac01fb15e7..f2081f8073d30b59f10f2eeebe1ddad8c2116f31 100644
(file)
--- a/
tests/regression/ust/linking/test_linking.py
+++ b/
tests/regression/ust/linking/test_linking.py
@@
-114,7
+114,7
@@
if DYNAMIC_TEST_ENABLED:
if sys.version_info >= (3 ,3):
try:
demo_process.wait(5)
if sys.version_info >= (3 ,3):
try:
demo_process.wait(5)
- except TimeoutExpired:
+ except
subprocess.
TimeoutExpired:
demo_process.kill()
bail("Failed to run demo test application without preloading")
else:
demo_process.kill()
bail("Failed to run demo test application without preloading")
else:
@@
-140,7
+140,7
@@
for executable in test_executables:
if sys.version_info >= (3, 3):
try:
demo_process.wait(5)
if sys.version_info >= (3, 3):
try:
demo_process.wait(5)
- except TimeoutExpired:
+ except
subprocess.
TimeoutExpired:
demo_process.kill()
bail("Failed to run {0} test application".format(executable_name))
else:
demo_process.kill()
bail("Failed to run {0} test application".format(executable_name))
else:
This page took
0.024439 seconds
and
4
git commands to generate.