Allow to factor code with ERP5 if needed

slapos/recipe/seleniumrunner/ERP5TypeFunctionalTestCase.py

@@ -69,7 +69,7 @@ class TimeoutError(Exception):
   pass
 
 class Xvfb:
-  def __init__(self, xvfb_location, fbdir):
+  def __init__(self, fbdir, xvfb_location="Xvfb"):
     self.display_list = [":%s" % i for i in range(123, 144)]
     self.display = None
     self.fbdir = fbdir
@@ -115,7 +115,7 @@ class Xvfb:
 class Browser:
 
   use_xvfb = 1
-  def __init__(self, bin_location, profile_dir, host):
+  def __init__(self, profile_dir, host, bin_location=None):
     self.bin_location = bin_location
     self.profile_dir = profile_dir
     self.host = host
@@ -175,6 +175,8 @@ class Firefox(Browser):
 
   def _run(self, url):
     # Prepare to run
+    if not self.bin_location:
+      self.bin_location = "firefox"
     self._createFile('prefs.js', self.getPrefJs())
     self._runCommand((self.bin_location, "firefox", "-no-remote",
                      "-profile", self.profile_dir, url))

slapos/recipe/seleniumrunner/testrunner.py

@@ -67,9 +67,9 @@ def run(args):
     #  sleep(10)
 
     os.environ['DISPLAY'] = config['display']
-    xvfb = Xvfb(config['xvfb_binary'], config['etc_directory'])
+    xvfb = Xvfb(config['etc_directory'], config['xvfb_binary'])
     profile_dir = os.path.join(config['etc_directory'], 'profile')
-    browser = Firefox(config['browser_binary'], profile_dir, config['base_url'])
+    browser = Firefox(profile_dir, config['base_url'], config['browser_binary'])
     try:
       start = time.time()
       xvfb.run()