diff options
| -rw-r--r-- | commands/common.py | 10 | ||||
| -rw-r--r-- | devbot/xvfb.py | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/commands/common.py b/commands/common.py index 118716e..b26e192 100644 --- a/commands/common.py +++ b/commands/common.py @@ -1,6 +1,5 @@ import os import sys -import subprocess base_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) helpers_dir = os.path.join(base_dir, "commands", "helpers") @@ -10,13 +9,6 @@ sys.path.append(base_dir) from devbot import system from devbot import config from devbot import distro -from devbot import xvfb - -class _DisplayProvider: - def find_free_display(self): - helper_path = os.path.join(config.libexec_dir, - "sugar-runner", "find-free-display") - return subprocess.check_output([helper_path]) def setup(): config.load_plugins() @@ -60,5 +52,3 @@ def setup(): package_files.append("buildslave") config.set_package_files(package_files) - - xvfb.set_display_provider(_DisplayProvider()) diff --git a/devbot/xvfb.py b/devbot/xvfb.py index b650bf1..6549b9d 100644 --- a/devbot/xvfb.py +++ b/devbot/xvfb.py @@ -3,15 +3,9 @@ import subprocess from devbot import utils -_display_provider = None - -def set_display_provider(provider): - global _display_provider - _display_provider = provider +xvfb_display = ":100" def start(): - xvfb_display = _display_provider.find_free_display() - xvfb_proc = subprocess.Popen(args=["Xvfb", xvfb_display], stdout=utils.devnull, stderr=subprocess.STDOUT) @@ -22,7 +16,7 @@ def start(): def stop(xvfb_proc, orig_display): if orig_display: - os.environ["DISPLAY"] = orig_display + os.environ["DISPLAY"] = xvfb_display else: del os.environ["DISPLAY"] |