[OE-core] [PATCH] oeqa/sshcontrol: Ensure we don't trigger ssh-askpass
Richard Purdie
richard.purdie at linuxfoundation.org
Thu Jul 23 15:51:27 UTC 2015
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 at linuxfoundation.org>
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index 1c81795..4f8d3d2 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:
More information about the Openembedded-core
mailing list