Optimize virtual display and logging code

Author: mdmintz

seleniumbase/virtual_display/abstractdisplay.py

@@ -7,10 +7,6 @@
 from seleniumbase.virtual_display import xauth
 
 mutex = Lock()
-RANDOMIZE_DISPLAY_NR = False
-if RANDOMIZE_DISPLAY_NR:
-    import random
-    random.seed()
 MIN_DISPLAY_NR = 1000
 USED_DISPLAY_NR_LIST = []
 
@@ -59,8 +55,6 @@ def search_for_display(self):
             display = max(MIN_DISPLAY_NR, max(ls) + 3)
         else:
             display = MIN_DISPLAY_NR
-        if RANDOMIZE_DISPLAY_NR:
-            display += random.randint(0, 100)
         return display
 
     def redirect_display(self, on):

seleniumbase/virtual_display/easyprocess.py

@@ -13,6 +13,7 @@
 import time
 
 log = logging.getLogger(__name__)
+log.setLevel(logging.ERROR)
 SECTION_LINK = 'link'
 POLL_TIME = 0.1
 USE_POLL = 0

seleniumbase/virtual_display/xauth.py

@@ -1,7 +1,7 @@
 '''Utility functions for xauth.'''
 import os
 import hashlib
-from seleniumbase.virtual_display import easyprocess
+from seleniumbase.virtual_display.easyprocess import EasyProcess
 
 
 class NotFoundError(Exception):
@@ -14,8 +14,11 @@ def is_installed():
     Return whether or not xauth is installed.
     '''
     try:
-        easyprocess.EasyProcess(['xauth', '-h']).check_installed()
-    except easyprocess.EasyProcessCheckInstalledError:
+        p = EasyProcess(['xauth', '-V'])
+        p.enable_stdout_log = False
+        p.enable_stderr_log = False
+        p.call()
+    except Exception:
         return False
     else:
         return True
@@ -33,4 +36,4 @@ def call(*args):
     '''
     Call xauth with the given args.
     '''
-    easyprocess.EasyProcess(['xauth'] + list(args)).call()
+    EasyProcess(['xauth'] + list(args)).call()

seleniumbase/virtual_display/xephyr.py

@@ -1,9 +1,7 @@
 from seleniumbase.virtual_display.easyprocess import EasyProcess
 from seleniumbase.virtual_display.abstractdisplay import AbstractDisplay
 
-PACKAGE = 'xephyr'
 PROGRAM = 'Xephyr'
-URL = None
 
 
 class XephyrDisplay(AbstractDisplay):
@@ -26,8 +24,10 @@ def __init__(self, size=(1024, 768), color_depth=24, bgcolor='black'):
 
     @classmethod
     def check_installed(cls):
-        EasyProcess([PROGRAM, '-help'], url=URL,
-                    ubuntu_package=PACKAGE).check_installed()
+        p = EasyProcess([PROGRAM, '-help'])
+        p.enable_stdout_log = False
+        p.enable_stderr_log = False
+        p.call()
 
     @property
     def _cmd(self):

seleniumbase/virtual_display/xvfb.py

@@ -1,9 +1,7 @@
 from seleniumbase.virtual_display.easyprocess import EasyProcess
 from seleniumbase.virtual_display.abstractdisplay import AbstractDisplay
 
-PACKAGE = 'xvfb'
 PROGRAM = 'Xvfb'
-URL = None
 
 
 class XvfbDisplay(AbstractDisplay):
@@ -32,8 +30,10 @@ def __init__(self, size=(1024, 768), color_depth=24,
 
     @classmethod
     def check_installed(cls):
-        EasyProcess([PROGRAM, '-help'], url=URL,
-                    ubuntu_package=PACKAGE).check_installed()
+        p = EasyProcess([PROGRAM, '-help'])
+        p.enable_stdout_log = False
+        p.enable_stderr_log = False
+        p.call()
 
     @property
     def _cmd(self):

seleniumbase/virtual_display/xvnc.py

@@ -1,9 +1,7 @@
 from seleniumbase.virtual_display.easyprocess import EasyProcess
 from seleniumbase.virtual_display.abstractdisplay import AbstractDisplay
 
-PACKAGE = 'tightvncserver'
 PROGRAM = 'Xvnc'
-URL = None
 
 
 class XvncDisplay(AbstractDisplay):
@@ -30,8 +28,10 @@ def __init__(self, size=(1024, 768), color_depth=24,
 
     @classmethod
     def check_installed(cls):
-        EasyProcess([PROGRAM, '-help'], url=URL,
-                    ubuntu_package=PACKAGE).check_installed()
+        p = EasyProcess([PROGRAM, '-help'])
+        p.enable_stdout_log = False
+        p.enable_stderr_log = False
+        p.call()
 
     @property
     def _cmd(self):