Skip to content
Snippets Groups Projects
Commit 84882d94 authored by Cedric Roux's avatar Cedric Roux
Browse files

Merge remote-tracking branch 'origin/fix-test-setup-2018-w08' into develop_integration_2018_w08

parents 365ca71a 1e2a7156
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
cmake_targets/autotests/v2/connection.py
+ 2
− 2
View file @ 84882d94
...@@ -13,7 +13,7 @@ class connection: ...@@ -13,7 +13,7 @@ class connection:
try: try:
(pid, fd) = os.forkpty() (pid, fd) = os.forkpty()
except BaseException, e: except BaseException, e:
log("ERROR: forkpty for '" + description + "': " + e) log("ERROR: forkpty for '" + description + "': " + str(e))
(pid, fd) = (-1, -1) (pid, fd) = (-1, -1)
if pid == -1: if pid == -1:
...@@ -26,7 +26,7 @@ class connection: ...@@ -26,7 +26,7 @@ class connection:
os.execvp('sshpass', ['sshpass', '-p', password, os.execvp('sshpass', ['sshpass', '-p', password,
'ssh', user + '@' + host]) 'ssh', user + '@' + host])
except BaseException, e: except BaseException, e:
log("ERROR: execvp for '" + description + "': " + e) log("ERROR: execvp for '" + description + "': " + str(e))
log("ERROR: execvp failed for '" + description + "'") log("ERROR: execvp failed for '" + description + "'")
os._exit(1) os._exit(1)
......
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