From 547c63f3d371ddd3e8b2c5419101332f14cacc43 Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Wed, 28 Nov 2012 08:52:47 +0000 Subject: Revert "Don't hardcode xvfb display" This reverts commit 0b506befd616219621a968e2a51bab9b254299d8. --- (limited to 'devbot') 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"] -- cgit v0.9.1