Commit ab41dcb4 authored by Julien Muchembled's avatar Julien Muchembled Committed by Jérome Perrin

component/firefox: simplify profile

Major change is that slapos compatible wrapper is no longer installed in
parts/firefox/firefox-slapos , but directly as "firefox" in the
buildout:bin-directory of the software profile.
geckodriver is also in the same buildout:bin-directory.
This way, softwares using this just need to add
buildout:bin-directory to $PATH

Adjust seleniumrunner and jstestnode for the changes

Also drop unused firefox 45

Jérome changes from original 8cf6908df752b9e7632b2910ffc85027f1f4f22c :
 - name section [firefox-install], because including the version in
section name means we have to also update section name when we update
version.
 - use same version, the "versions up" will be separate commits.
 - now that seleniumrunner and jstestnode are using buildout.hash.cfg,
md5sums are in separate files.
Co-authored-by: Jérome Perrin's avatarJérome Perrin <jerome@nexedi.com>
parent c2fd2663
This diff is collapsed.
...@@ -27,4 +27,4 @@ md5sum = 9f22db89a2679534aa8fd37dbca86782 ...@@ -27,4 +27,4 @@ md5sum = 9f22db89a2679534aa8fd37dbca86782
[template-runTestSuite] [template-runTestSuite]
filename = runTestSuite.in filename = runTestSuite.in
md5sum = 8528d90cce5d034195e3e71bef855c48 md5sum = 133c13fa8debcda97df0c9a6586b7604
...@@ -94,8 +94,8 @@ def main(): ...@@ -94,8 +94,8 @@ def main():
firefox_capabilities = webdriver.common.desired_capabilities.DesiredCapabilities.FIREFOX firefox_capabilities = webdriver.common.desired_capabilities.DesiredCapabilities.FIREFOX
firefox_capabilities['marionette'] = True firefox_capabilities['marionette'] = True
browser = webdriver.Firefox(capabilities=firefox_capabilities, browser = webdriver.Firefox(capabilities=firefox_capabilities,
firefox_binary='${firefox:location}/firefox-slapos', firefox_binary='${firefox:location}',
executable_path='${firefox:location}/geckodriver') executable_path='${geckodriver:location}')
elif args.target in ['iOS', 'Android']: elif args.target in ['iOS', 'Android']:
# parameters for mobile emulators have different names then parameters for # parameters for mobile emulators have different names then parameters for
# desktop OSes # desktop OSes
......
...@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88 ...@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
[template-selenium] [template-selenium]
filename = instance-selenium.cfg.in filename = instance-selenium.cfg.in
md5sum = 8be91f4515decef0f8af5910e43e0e52 md5sum = e30b1738099bf80c44d003ea57f709b4
...@@ -17,7 +17,7 @@ report-project = $${slap-parameter:report-project} ...@@ -17,7 +17,7 @@ report-project = $${slap-parameter:report-project}
[firefox-instance] [firefox-instance]
recipe = slapos.cookbook:firefox recipe = slapos.cookbook:firefox
runner-path = $${rootdirectory:bin}/firefox-sandboxed runner-path = $${rootdirectory:bin}/firefox-sandboxed
firefox-path = ${firefox:location}/firefox-slapos firefox-path = ${firefox:location}
prefsjs-path = $${rootdirectory:etc}/prefs.js prefsjs-path = $${rootdirectory:etc}/prefs.js
shell-path = ${dash:location}/bin/dash shell-path = ${dash:location}/bin/dash
tmp-path = $${xvfb-instance:tmp-path} tmp-path = $${xvfb-instance:tmp-path}
......
...@@ -16,6 +16,7 @@ parts = ...@@ -16,6 +16,7 @@ parts =
instance-recipe-egg instance-recipe-egg
xserver xserver
firefox firefox
geckodriver
xwd xwd
[instance-recipe] [instance-recipe]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment