Commit 8cf6908d authored by Julien Muchembled's avatar Julien Muchembled

wip

parent c931c7d4
This diff is collapsed.
......@@ -92,8 +92,8 @@ def main():
firefox_capabilities = webdriver.common.desired_capabilities.DesiredCapabilities.FIREFOX
firefox_capabilities['marionette'] = True
browser = webdriver.Firefox(capabilities=firefox_capabilities,
firefox_binary='${firefox:location}/firefox-slapos',
executable_path='${firefox:location}/geckodriver')
firefox_binary='${firefox:location}',
executable_path='${geckodriver:location}')
elif args.target in ['iOS', 'Android']:
# parameters for mobile emulators have different names then parameters for
# desktop OSes
......
......@@ -107,7 +107,7 @@ mode = 0644
[template-runTestSuite]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/runTestSuite.in
md5sum = ff66d13f73982e8257eb5535cdb541c7
md5sum = 29cc08fe6b2ceabea697f21598f78d37
output = ${buildout:directory}/runTestSuite.in
mode = 0644
......
......@@ -17,7 +17,7 @@ report-project = $${slap-parameter:report-project}
[firefox-instance]
recipe = slapos.cookbook:firefox
runner-path = $${rootdirectory:bin}/firefox-sandboxed
firefox-path = ${firefox:location}/firefox-slapos
firefox-path = ${firefox:location}
prefsjs-path = $${rootdirectory:etc}/prefs.js
shell-path = ${dash:location}/bin/dash
tmp-path = $${xvfb-instance:tmp-path}
......
......@@ -15,6 +15,7 @@ parts =
instance-recipe-egg
xserver
firefox
geckodriver
xwd
[instance-recipe]
......@@ -41,7 +42,7 @@ mode = 0644
[template-selenium]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-selenium.cfg
md5sum = 8be91f4515decef0f8af5910e43e0e52
md5sum = e30b1738099bf80c44d003ea57f709b4
output = ${buildout:directory}/template-selenium.cfg
mode = 0644
......
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