From 18576f55c34dbdc4c0ac79639dbc1dbf1ce7affe Mon Sep 17 00:00:00 2001
From: Igor Bernstein <igorbernstein@google.com>
Date: Mon, 28 Oct 2019 15:52:51 -0400
Subject: [PATCH] fix: fix maven test configs to make sure admin tests don't
 clobber data tests (#47)

* fix: fix maven test configs to make sure admin tests don't clobber data tests

* Update include patterns
---
 google-cloud-bigtable/pom.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index f3d3a965d..5bd659ea7 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -206,8 +206,9 @@
                   <systemPropertyVariables>
                     <bigtable.env>emulator</bigtable.env>
                   </systemPropertyVariables>
-                  <test>com.google.cloud.bigtable.data.v2.it.**</test>
-                  <test>com.google.cloud.bigtable.admin.v2.it.**</test>
+                  <includes>
+                    <include>com.google.cloud.bigtable.**.it.*IT</include>
+                  </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-emulator-it.xml</summaryFile>
                 </configuration>
               </execution>
@@ -234,8 +235,9 @@
                   <systemPropertyVariables>
                     <bigtable.env>prod</bigtable.env>
                   </systemPropertyVariables>
-                  <test>com.google.cloud.bigtable.data.v2.it.**</test>
-                  <test>com.google.cloud.bigtable.admin.v2.it.**</test>
+                  <includes>
+                    <include>com.google.cloud.bigtable.**.it.*IT</include>
+                  </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-prod-it.xml</summaryFile>
                 </configuration>
               </execution>
@@ -268,8 +270,10 @@
                   <environmentVariables>
                     <GOOGLE_CLOUD_ENABLE_DIRECT_PATH>bigtable</GOOGLE_CLOUD_ENABLE_DIRECT_PATH>
                   </environmentVariables>
-                  <!-- TODO(igorbernstein): Once the control plane is accessible via directpath, add admin tests -->
-                  <test>com.google.cloud.bigtable.data.v2.it.**</test>
+                  <includes>
+                    <!-- TODO(igorbernstein): Once the control plane is accessible via directpath, add admin tests -->
+                    <include>com.google.cloud.bigtable.data.v2.it.*IT</include>
+                  </includes>
                   <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-directpath-it.xml</summaryFile>
                 </configuration>
               </execution>