Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/devbot
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-11-28 08:52:47 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-11-28 08:52:47 (GMT)
commit547c63f3d371ddd3e8b2c5419101332f14cacc43 (patch)
tree2617e9ff0fd467dc22009defeeeae389936955c2 /devbot
parent750d7a635ec56717549dd22bb694ce9ad65aea63 (diff)
Revert "Don't hardcode xvfb display"
This reverts commit 0b506befd616219621a968e2a51bab9b254299d8.
Diffstat (limited to 'devbot')
-rw-r--r--devbot/xvfb.py10
1 files changed, 2 insertions, 8 deletions
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"]