update kill command and revert to DriverManager to auto-find chrome installation

Sita04 · Sita04 · commit 86c660b98c86 · 2023-03-20T20:35:03.000-04:00
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -116,7 +116,7 @@ fi
 
 # Install Chrome and chrome driver for recaptcha tests.
 current_dir="$PWD"
-pkill chrome
+ps aux | awk '/chrome/ { print $2 } ' | xargs kill -9
 # Install Chrome.
 curl https://dl-ssl.google.com/linux/linux_signing_key.pub -o /tmp/google.pub \
   && cat /tmp/google.pub | apt-key add -; rm /tmp/google.pub \
diff --git a/recaptcha_enterprise/snippets/src/test/java/app/SnippetsIT.java b/recaptcha_enterprise/snippets/src/test/java/app/SnippetsIT.java
@@ -25,6 +25,7 @@
 import account_defender.ListRelatedAccountGroups;
 import account_defender.SearchRelatedAccountGroupMemberships;
 import com.google.protobuf.ByteString;
+import io.github.bonigarcia.wdm.WebDriverManager;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -95,11 +96,8 @@ public static void setUp() throws IOException, InterruptedException {
     TimeUnit.SECONDS.sleep(5);
 
     // Set Selenium Driver to Chrome.
-    ChromeOptions chromeOptions = new ChromeOptions().setBinary(CHROME_DRIVER_PATH);
-    chromeOptions.addArguments("--no-sandbox");
-    chromeOptions.addArguments("--headless");
-    chromeOptions.addArguments("--disable-gpu");
-    BROWSER = new ChromeDriver(chromeOptions);
+    WebDriverManager.chromedriver().setup();
+    BROWSER = new ChromeDriver();
     TimeUnit.SECONDS.sleep(5);
   }
 
