From 9823ee7fcf147d55763c24e9359da751b9c25c70 Mon Sep 17 00:00:00 2001
From: shicong <shicong@google.com>
Date: Mon, 11 Mar 2019 13:48:35 -0700
Subject: [PATCH] Enable Webdriver test in Kokoro build

We changed to use Docker to provision Chrome browser and
ChromeDriverService, and the used Kokoro VM comes with
the docker CLI so we can enable the webdriver tests again
in kokoro build.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=237874165
---
 gradle/core/build.gradle | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/gradle/core/build.gradle b/gradle/core/build.gradle
index 3b6f4a606..58d392a1b 100644
--- a/gradle/core/build.gradle
+++ b/gradle/core/build.gradle
@@ -647,11 +647,8 @@ test {
   exclude "**/*TestCase.*", "**/*TestSuite.*"
   exclude fragileTestPatterns
   exclude outcastTestPatterns
-  if (rootProject.hasProperty("excludeWebDriverTests")) {
-      exclude "**/webdriver/*"
-  } else {
-      dependsOn dockerRun
-  }
+
+  dependsOn dockerRun
 
   // Run every test class in its own process.
   // Uncomment to unblock build while troubleshooting inexplicable test errors.
@@ -667,10 +664,8 @@ test {
     new File(screenshotsDir).deleteDir()
   }
 }.dependsOn(fragileTest, outcastTest)
+test.finalizedBy(dockerStopAtEnd)
 
-if (!rootProject.hasProperty("excludeWebDriverTests")) {
-  test.finalizedBy(dockerStopAtEnd)
-}
 
 task nomulus(type: Jar) {
   manifest {