selenium server soft

software/seleniumrunner/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = c48b4c1cf970e417f49a5b790f1b7bdc
+md5sum = bf396487aca5857b5472b16f4556d993

software/seleniumrunner/instance-selenium.cfg.in

@@ -66,7 +66,7 @@ command-line =
     -host $${:hostname}
     -port $${:port}
     -role node
-    -timeout 20
+    -timeout 300
     -hub $${selenium-server-hub-instance:register-url}
     -capabilities $${:capabilities}
     --debug
@@ -98,9 +98,9 @@ capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX
 java-args = -Dwebdriver.gecko.driver=${geckodriver-0.21.0:location}
 port = 7779
 
-[selenium-server-node-instance-chromium-68]
+[selenium-server-node-instance-chromium-69]
 <= selenium-server-node-instance
-capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-68:version},chrome_binary=${chromium-wrapper-68:location}/chrome-slapos
+capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-69:version},chrome_binary=${chromium-wrapper-69:location}/chrome-slapos
 java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-2.41:location}
 port = 7780
 
@@ -113,14 +113,7 @@ instance-promises =
   $${selenium-server-node-firefox-51-listen-promise:path}
   $${selenium-server-node-firefox-52-listen-promise:path}
   $${selenium-server-node-firefox-60-listen-promise:path}
-  $${selenium-server-node-instance-chromium-68-listen-promise:path}
-# XXX firefox-60 does not work because of incompatibilities with our x11 TMPDIR patch.
-# running firefox --marionette complains Gtk-WARNING **: cannot open display: :0
-# running strace -f -s 100 TMPDIR=/same/tmpdir/as/xvfb/ firefox --marionette
-# shows that some subprocesses are spawned with different TMPDIR.
-
-##### connect(15, {sa_family=AF_UNIX, sun_path=@"/srv/slapgrid/slappart8/tmp/inst/TestRemoteDriver-0/tmp/Temp-0336e727-3485-4774-a816-75fda1baca12/.X11-unix"}, 113) = -1 EINVAL (Invalid argument)
-##### write(2, "\n(/srv/slapgrid/slappart8/tmp/soft/c5be5b0096cd286c70df5156590cf4f6/parts/firefox-60/firefox:29812): Gtk-\33[1;33mWARNING\33[0m **: cannot open display: :0\n", 152) = 152
+  $${selenium-server-node-instance-chromium-69-listen-promise:path}
 
 
 [check-port-listening-promise]
@@ -147,10 +140,10 @@ port = $${selenium-server-node-instance-firefox-52:port}
 hostname= $${selenium-server-node-instance-firefox-60:hostname}
 port = $${selenium-server-node-instance-firefox-60:port}
 
-[selenium-server-node-instance-chromium-68-listen-promise]
+[selenium-server-node-instance-chromium-69-listen-promise]
 <= check-port-listening-promise
-hostname= $${selenium-server-node-instance-chromium-68:hostname}
-port = $${selenium-server-node-instance-chromium-68:port}
+hostname= $${selenium-server-node-instance-chromium-69:hostname}
+port = $${selenium-server-node-instance-chromium-69:port}
 
 
 [publish-connection-parameter]

software/seleniumrunner/software.cfg

@@ -7,6 +7,7 @@ extends =
    ../../component/lxml-python/buildout.cfg
    ../../component/firefox/buildout.cfg
    ../../component/chromium/buildout.cfg
+   ../../component/chromedriver/buildout.cfg
    ../../component/dash/buildout.cfg
    ../../component/java/buildout.cfg
    ../../stack/slapos.cfg