summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-23 16:51:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-24 23:29:40 +0100
commit085681a1418a29a8331cdde0f477f4e223de84be (patch)
tree2fc26e3acded61a0d73ca8b563626a3e2910d0c9 /meta
parentf9ec9c89956810f21955819677e92588540a4748 (diff)
downloadopenembedded-core-085681a1418a29a8331cdde0f477f4e223de84be.tar.gz
openembedded-core-085681a1418a29a8331cdde0f477f4e223de84be.tar.bz2
openembedded-core-085681a1418a29a8331cdde0f477f4e223de84be.zip
oeqa/sshcontrol: Ensure we don't trigger ssh-askpass
If DISPLAY is set, ssh-askpass can be triggered which is not what we want in the middle of sanity tests. We can disable this by unsetting DISPLAY. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/utils/sshcontrol.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index 1c81795a87..4f8d3d2c98 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/meta/lib/oeqa/utils/sshcontrol.py
@@ -10,6 +10,7 @@ import subprocess
import time
import os
import select
+import copy
class SSHProcess(object):
@@ -31,6 +32,12 @@ class SSHProcess(object):
self.starttime = None
self.logfile = None
+ # Unset DISPLAY which means we won't trigger SSH_ASKPASS
+ env = copy.copy(os.environ)
+ if "DISPLAY" in env:
+ del env['DISPLAY']
+ self.options['env'] = env
+
def log(self, msg):
if self.logfile:
with open(self.logfile, "a") as f: