From 6e51b9abadd8f3fe9af4d9e21a7bfde63ecc7cc7 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Sat, 20 Jul 2024 13:14:50 -0700 Subject: [PATCH 1/3] fix: Explicitly set `executable_path` for Selenium So it finds `geckodriver` again. --- ietf/utils/jstest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf/utils/jstest.py b/ietf/utils/jstest.py index 07d6ed9dd00..ffd380c7ce6 100644 --- a/ietf/utils/jstest.py +++ b/ietf/utils/jstest.py @@ -30,7 +30,7 @@ print(" "+skip_message) def start_web_driver(): - service = Service(log_output=f"{executable_name}.log", service_args=['--log-no-truncate']) + service = Service(executable_path=f"/usr/bin/geckodriver", log_output=f"{executable_name}.log", service_args=['--log-no-truncate']) options = Options() options.add_argument("--headless") os.environ["MOZ_REMOTE_SETTINGS_DEVTOOLS"] = "1" @@ -54,14 +54,14 @@ def setUp(self): super(IetfSeleniumTestCase, self).setUp() self.driver = start_web_driver() self.driver.set_window_size(1024,768) - + def tearDown(self): super(IetfSeleniumTestCase, self).tearDown() self.driver.close() def absreverse(self,*args,**kwargs): return '%s%s'%(self.live_server_url, urlreverse(*args, **kwargs)) - + def debug_snapshot(self,filename='debug_this.png'): self.driver.execute_script("document.body.bgColor = 'white';") self.driver.save_screenshot(filename) From bc5ee33d1f582f333d814dfd5001d3758b7d4206 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Sat, 20 Jul 2024 13:17:35 -0700 Subject: [PATCH 2/3] Minimize diff --- ietf/utils/jstest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf/utils/jstest.py b/ietf/utils/jstest.py index ffd380c7ce6..7c05c215363 100644 --- a/ietf/utils/jstest.py +++ b/ietf/utils/jstest.py @@ -54,14 +54,14 @@ def setUp(self): super(IetfSeleniumTestCase, self).setUp() self.driver = start_web_driver() self.driver.set_window_size(1024,768) - + def tearDown(self): super(IetfSeleniumTestCase, self).tearDown() self.driver.close() def absreverse(self,*args,**kwargs): return '%s%s'%(self.live_server_url, urlreverse(*args, **kwargs)) - + def debug_snapshot(self,filename='debug_this.png'): self.driver.execute_script("document.body.bgColor = 'white';") self.driver.save_screenshot(filename) From ee16ba1014e0ef04886f9716d9e8af670ae147f7 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sat, 20 Jul 2024 15:11:13 -0700 Subject: [PATCH 3/3] fix: use existing executable_name Co-authored-by: Lars Eggert --- ietf/utils/jstest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/utils/jstest.py b/ietf/utils/jstest.py index 7c05c215363..157f97912b9 100644 --- a/ietf/utils/jstest.py +++ b/ietf/utils/jstest.py @@ -30,7 +30,7 @@ print(" "+skip_message) def start_web_driver(): - service = Service(executable_path=f"/usr/bin/geckodriver", log_output=f"{executable_name}.log", service_args=['--log-no-truncate']) + service = Service(executable_path=f"/usr/bin/{executable_name}", log_output=f"{executable_name}.log", service_args=['--log-no-truncate']) options = Options() options.add_argument("--headless") os.environ["MOZ_REMOTE_SETTINGS_DEVTOOLS"] = "1"