software/seleniumserver: add firefox 115 and remove firefox 52

software/seleniumserver/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = 10e19df182c692b71ea552da183a0bcf
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = 2d84d5fb9306b88ef71e101acb46f684
+md5sum = 389766d95744b80fdc80a10cdde9551c

software/seleniumserver/instance-selenium.cfg.in

@@ -97,28 +97,28 @@ environment =
 hostname = $${slap-configuration:ipv4-random}
 
 
-[selenium-server-node-instance-firefox-52]
-<= selenium-server-node-instance
-capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-52:version},firefox_binary=${firefox-wrapper-52:location}
-java-args = -Dwebdriver.gecko.driver=${geckodriver-0.16.1:location}
-port = 7777
-
 [selenium-server-node-instance-firefox-60]
 <= selenium-server-node-instance
 capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-60:version},firefox_binary=${firefox-wrapper-60:location}
 java-args = -Dwebdriver.gecko.driver=${geckodriver-0.22.0:location}
-port = 7778
+port = 7777
 
 [selenium-server-node-instance-firefox-68]
 <= selenium-server-node-instance
 capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-68:version},firefox_binary=${firefox-wrapper-68:location}
 java-args = -Dwebdriver.gecko.driver=${geckodriver-0.24.0:location}
-port = 7779
+port = 7778
 
 [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 = 7779
+
+[selenium-server-node-instance-firefox-115]
+<= selenium-server-node-instance
+capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-115:version},firefox_binary=${firefox-wrapper-115:location}
+java-args = -Dwebdriver.gecko.driver=${geckodriver-0.33.0:location}
 port = 7780
 
 [selenium-server-node-instance-chromium-69]
@@ -303,10 +303,10 @@ instance-promises =
   $${selenium-server-frontend-listen-promise:name}
   $${selenium-server-hub-listen-promise:name}
   $${selenium-server-hub-nodes-registered-promise:name}
-  $${selenium-server-node-firefox-52-listen-promise:name}
   $${selenium-server-node-firefox-60-listen-promise:name}
   $${selenium-server-node-firefox-68-listen-promise:name}
   $${selenium-server-node-firefox-78-listen-promise:name}
+  $${selenium-server-node-firefox-115-listen-promise:name}
   $${selenium-server-node-instance-chromium-69-listen-promise:name}
   $${selenium-server-node-instance-chromium-91-listen-promise:name}
 
@@ -353,11 +353,6 @@ inline =
   sys.exit(0 if expected_node_count == actual_node_count else 1)
 
 
-[selenium-server-node-firefox-52-listen-promise]
-<= check-port-listening-promise
-config-host = $${selenium-server-node-instance-firefox-52:hostname}
-config-port = $${selenium-server-node-instance-firefox-52:port}
-
 [selenium-server-node-firefox-60-listen-promise]
 <= check-port-listening-promise
 config-host = $${selenium-server-node-instance-firefox-60:hostname}
@@ -373,6 +368,11 @@ config-port = $${selenium-server-node-instance-firefox-68:port}
 config-host = $${selenium-server-node-instance-firefox-78:hostname}
 config-port = $${selenium-server-node-instance-firefox-78:port}
 
+[selenium-server-node-firefox-115-listen-promise]
+<= check-port-listening-promise
+config-host = $${selenium-server-node-instance-firefox-115:hostname}
+config-port = $${selenium-server-node-instance-firefox-115:port}
+
 [selenium-server-node-instance-chromium-69-listen-promise]
 <= check-port-listening-promise
 config-host = $${selenium-server-node-instance-chromium-69:hostname}

software/seleniumserver/software.cfg

@@ -75,3 +75,7 @@ post-install =
 [firefox-78]
 post-install =
   ${symlink-extra-fonts-to-firefox-fonts-dir:install}
+
+[firefox-115]
+post-install =
+  ${symlink-extra-fonts-to-firefox-fonts-dir:install}

software/seleniumserver/test/test.py

@@ -290,12 +290,12 @@ class TestBrowserSelection(WebServerMixin, SeleniumServerTestCase):
         'Gecko/20100101 Firefox/60.0',
         driver.execute_script('return navigator.userAgent'))
     driver.quit()
-    desired_capabilities['version'] = '52.9.0esr'
+    desired_capabilities['version'] = '115.3.1esr'
     driver = webdriver.Remote(
         command_executor=webdriver_url,
         desired_capabilities=desired_capabilities)
     self.assertIn(
-        'Gecko/20100101 Firefox/52.0',
+        'Gecko/20100101 Firefox/115.0',
         driver.execute_script('return navigator.userAgent'))
     driver.quit()
 
@@ -397,19 +397,6 @@ class TestSSHServer(SeleniumServerTestCase):
       self.assertIn(b"Welcome to SlapOS Selenium Server.", received)
 
 
-class TestFirefox52(
-    BrowserCompatibilityMixin,
-    SeleniumServerTestCase,
-    ImageComparisonTestCase,
-):
-  desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='52.9.0esr')
-  user_agent = 'Gecko/20100101 Firefox/52.0'
-  # resizing window is not supported on firefox 52 geckodriver
-  @unittest.expectedFailure
-  def test_resize_window(self):
-    super().test_resize_window()
-
-
 class TestFirefox60(
     BrowserCompatibilityMixin,
     SeleniumServerTestCase,
@@ -427,6 +414,7 @@ class TestFirefox68(
   desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='68.0.2esr')
   user_agent = 'Gecko/20100101 Firefox/68.0'
 
+
 class TestFirefox78(
     BrowserCompatibilityMixin,
     SeleniumServerTestCase,
@@ -436,6 +424,20 @@ class TestFirefox78(
   user_agent = 'Gecko/20100101 Firefox/78.0'
 
 
+class TestFirefox115(
+    BrowserCompatibilityMixin,
+    SeleniumServerTestCase,
+    ImageComparisonTestCase,
+):
+  desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='115.3.1esr')
+  user_agent = 'Gecko/20100101 Firefox/115.0'
+
+  # resizing window does not work, but we don't really depend on it
+  @unittest.expectedFailure
+  def test_resize_window(self):
+    super().test_resize_window()
+
+
 class TestChrome69(
     BrowserCompatibilityMixin,
     SeleniumServerTestCase,