Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lisa Casino
slapos
Commits
4da9e936
Commit
4da9e936
authored
Jun 22, 2021
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/seleniumserver: enable firefox 78.1.0esr
parent
755815fd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
5 deletions
+29
-5
software/seleniumserver/buildout.hash.cfg
software/seleniumserver/buildout.hash.cfg
+1
-1
software/seleniumserver/instance-selenium.cfg.in
software/seleniumserver/instance-selenium.cfg.in
+16
-4
software/seleniumserver/software.cfg
software/seleniumserver/software.cfg
+4
-0
software/seleniumserver/test/data/test.TestFirefox78.test_screenshot.png
...umserver/test/data/test.TestFirefox78.test_screenshot.png
+0
-0
software/seleniumserver/test/test.py
software/seleniumserver/test/test.py
+8
-0
No files found.
software/seleniumserver/buildout.hash.cfg
View file @
4da9e936
...
@@ -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 =
5336624ed74232f3f220b8942588ff14
md5sum =
b9088343e98540d42f7134f55fa67859
software/seleniumserver/instance-selenium.cfg.in
View file @
4da9e936
...
@@ -115,17 +115,23 @@ capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX
...
@@ -115,17 +115,23 @@ capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX
java-args = -Dwebdriver.gecko.driver=${geckodriver-0.24.0:location}
java-args = -Dwebdriver.gecko.driver=${geckodriver-0.24.0:location}
port = 7779
port = 7779
[selenium-server-node-instance-firefox-78]
<= selenium-server-node-instance
capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-78:version},firefox_binary=${firefox-wrapper-78:location}
java-args = -Dwebdriver.gecko.driver=${geckodriver-0.24.0:location}
port = 7780
[selenium-server-node-instance-chromium-69]
[selenium-server-node-instance-chromium-69]
<= selenium-server-node-instance
<= selenium-server-node-instance
capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-69:version},chrome_binary=${chromium-wrapper-69:location}
capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-69:version},chrome_binary=${chromium-wrapper-69:location}
java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-2.41:location}
java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-2.41:location}
port = 778
0
port = 778
1
[selenium-server-node-instance-chromium-91]
[selenium-server-node-instance-chromium-91]
<= selenium-server-node-instance
<= selenium-server-node-instance
capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-91:version},chrome_binary=${chromium-wrapper-91:location}
capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-91:version},chrome_binary=${chromium-wrapper-91:location}
java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-91:location}
java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-91:location}
port = 778
1
port = 778
2
[selenium-server-admin-password]
[selenium-server-admin-password]
...
@@ -270,6 +276,7 @@ instance-promises =
...
@@ -270,6 +276,7 @@ instance-promises =
$${selenium-server-node-firefox-52-listen-promise:name}
$${selenium-server-node-firefox-52-listen-promise:name}
$${selenium-server-node-firefox-60-listen-promise:name}
$${selenium-server-node-firefox-60-listen-promise:name}
$${selenium-server-node-firefox-68-listen-promise:name}
$${selenium-server-node-firefox-68-listen-promise:name}
$${selenium-server-node-firefox-78-listen-promise:name}
$${selenium-server-node-instance-chromium-69-listen-promise:name}
$${selenium-server-node-instance-chromium-69-listen-promise:name}
$${selenium-server-node-instance-chromium-91-listen-promise:name}
$${selenium-server-node-instance-chromium-91-listen-promise:name}
...
@@ -301,8 +308,8 @@ module = check_command_execute
...
@@ -301,8 +308,8 @@ module = check_command_execute
name = $${:_buildout_section_name_}.py
name = $${:_buildout_section_name_}.py
config-command =
config-command =
$${selenium-server-check-nodes-registered:rendered} $${selenium-server-hub-instance:api-url} $${:expected-node-count}
$${selenium-server-check-nodes-registered:rendered} $${selenium-server-hub-instance:api-url} $${:expected-node-count}
# We have
5
nodes with 3 slots each
# We have
6
nodes with 3 slots each
expected-node-count = 1
5
expected-node-count = 1
8
[selenium-server-check-nodes-registered]
[selenium-server-check-nodes-registered]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -333,6 +340,11 @@ config-port = $${selenium-server-node-instance-firefox-60:port}
...
@@ -333,6 +340,11 @@ config-port = $${selenium-server-node-instance-firefox-60:port}
config-hostname = $${selenium-server-node-instance-firefox-68:hostname}
config-hostname = $${selenium-server-node-instance-firefox-68:hostname}
config-port = $${selenium-server-node-instance-firefox-68:port}
config-port = $${selenium-server-node-instance-firefox-68:port}
[selenium-server-node-firefox-78-listen-promise]
<= check-port-listening-promise
config-hostname = $${selenium-server-node-instance-firefox-78:hostname}
config-port = $${selenium-server-node-instance-firefox-78:port}
[selenium-server-node-instance-chromium-69-listen-promise]
[selenium-server-node-instance-chromium-69-listen-promise]
<= check-port-listening-promise
<= check-port-listening-promise
config-hostname = $${selenium-server-node-instance-chromium-69:hostname}
config-hostname = $${selenium-server-node-instance-chromium-69:hostname}
...
...
software/seleniumserver/software.cfg
View file @
4da9e936
...
@@ -73,5 +73,9 @@ post-install =
...
@@ -73,5 +73,9 @@ post-install =
post-install =
post-install =
${symlink-extra-fonts-to-firefox-fonts-dir:install}
${symlink-extra-fonts-to-firefox-fonts-dir:install}
[firefox-78]
post-install =
${symlink-extra-fonts-to-firefox-fonts-dir:install}
[versions]
[versions]
plone.recipe.command = 1.1
plone.recipe.command = 1.1
software/seleniumserver/test/data/test.TestFirefox78.test_screenshot.png
0 → 100644
View file @
4da9e936
11.3 KB
software/seleniumserver/test/test.py
View file @
4da9e936
...
@@ -426,6 +426,14 @@ class TestFirefox68(
...
@@ -426,6 +426,14 @@ class TestFirefox68(
desired_capabilities
=
dict
(
DesiredCapabilities
.
FIREFOX
,
version
=
'68.0.2esr'
)
desired_capabilities
=
dict
(
DesiredCapabilities
.
FIREFOX
,
version
=
'68.0.2esr'
)
user_agent
=
'Gecko/20100101 Firefox/68.0'
user_agent
=
'Gecko/20100101 Firefox/68.0'
class
TestFirefox78
(
BrowserCompatibilityMixin
,
SeleniumServerTestCase
,
ImageComparisonTestCase
,
):
desired_capabilities
=
dict
(
DesiredCapabilities
.
FIREFOX
,
version
=
'78.1.0esr'
)
user_agent
=
'Gecko/20100101 Firefox/78.0'
class
TestChrome69
(
class
TestChrome69
(
BrowserCompatibilityMixin
,
BrowserCompatibilityMixin
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment