diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-09 18:46:14 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-09 18:46:14 +0100 |
| commit | ff24adb8293e31f0a54bef595f189f9cbd2d81a3 (patch) | |
| tree | 91690e039a055ace3f9d2b275a464a74d547eb18 /scripts/Util.py | |
| parent | C++11 custom test fixes (diff) | |
| parent | Fixed ICE-7476 - Ice/background test failure on stretch with SSL (diff) | |
| download | ice-ff24adb8293e31f0a54bef595f189f9cbd2d81a3.tar.bz2 ice-ff24adb8293e31f0a54bef595f189f9cbd2d81a3.tar.xz ice-ff24adb8293e31f0a54bef595f189f9cbd2d81a3.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index bc2cf0861a5..2e34bbd78e7 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2062,7 +2062,7 @@ class BrowserProcessController(RemoteProcessController): # capabilities["acceptInsecureCerts"] = True # capabilities["moz:firefoxOptions"] = {} # capabilities["moz:firefoxOptions"]["binary"] = "/Applications/FirefoxNightly.app/Contents/MacOS/firefox-bin" - if isinstance(platform, Linux) and os.environ.get("DISPLAY", "") != ":1" and os.environ.get("USER", "") == "jenkins": + if isinstance(platform, Linux) and os.environ.get("DISPLAY", "") != ":1" and os.environ.get("USER", "") == "ubuntu": current.writeln("error: DISPLAY is unset, setting it to :1") os.environ["DISPLAY"] = ":1" |