[py] Fix chromedriver/msedgedriver service tests

Author: cgoldberg

py/test/selenium/webdriver/chrome/chrome_service_tests.py

@@ -69,7 +69,9 @@ def test_log_output_as_filename(clean_driver, clean_options, driver_executable)
         assert "--log-path=chromedriver.log" in service.service_args
         driver = clean_driver(options=clean_options, service=service)
         with open(log_file) as fp:
-            assert "Starting ChromeDriver" in fp.readline()
+            out = fp.read()
+            assert "Starting" in out
+            assert "started successfully" in out
     finally:
         driver.quit()
         os.remove(log_file)
@@ -84,7 +86,9 @@ def test_log_output_as_file(clean_driver, clean_options, driver_executable) -> N
         driver = clean_driver(options=clean_options, service=service)
         time.sleep(1)
         with open(log_name) as fp:
-            assert "Starting ChromeDriver" in fp.readline()
+            out = fp.read()
+            assert "Starting" in out
+            assert "started successfully" in out
     finally:
         driver.quit()
         log_file.close()
@@ -97,14 +101,16 @@ def test_log_output_as_stdout(clean_driver, clean_options, capfd, driver_executa
     driver = clean_driver(options=clean_options, service=service)
 
     out, err = capfd.readouterr()
-    assert "Starting ChromeDriver" in out
+    assert "Starting" in out
+    assert "started successfully" in out
     driver.quit()
 
 
 @pytest.mark.no_driver_after_test
 def test_log_output_null_default(driver, capfd) -> None:
     out, err = capfd.readouterr()
-    assert "Starting ChromeDriver" not in out
+    assert "Starting" in out
+    assert "started successfully" in out
     driver.quit()
 
 

py/test/selenium/webdriver/edge/edge_service_tests.py

@@ -69,7 +69,9 @@ def test_log_output_as_filename(clean_driver, clean_options, driver_executable)
         assert "--log-path=msedgedriver.log" in service.service_args
         driver = clean_driver(options=clean_options, service=service)
         with open(log_file) as fp:
-            assert "Starting Microsoft Edge WebDriver" in fp.readline()
+            out = fp.read()
+            assert "Starting" in out
+            assert "started successfully" in out
     finally:
         driver.quit()
         os.remove(log_file)
@@ -84,7 +86,9 @@ def test_log_output_as_file(clean_driver, clean_options, driver_executable) -> N
         driver = clean_driver(options=clean_options, service=service)
         time.sleep(1)
         with open(log_name) as fp:
-            assert "Starting msedgedriver" in fp.readline()
+            out = fp.read()
+            assert "Starting" in out
+            assert "started successfully" in out
     finally:
         driver.quit()
         log_file.close()
@@ -97,14 +101,16 @@ def test_log_output_as_stdout(clean_driver, clean_options, capfd, driver_executa
     driver = clean_driver(options=clean_options, service=service)
 
     out, err = capfd.readouterr()
-    assert "Starting msedgedriver" in out
+    assert "Starting" in out
+    assert "started successfully" in out
     driver.quit()
 
 
 @pytest.mark.no_driver_after_test
 def test_log_output_null_default(driver, capfd) -> None:
     out, err = capfd.readouterr()
-    assert "Starting Microsoft Edge WebDriver" not in out
+    assert "Starting" in out
+    assert "started successfully" in out
     driver.quit()