Remove accidental change to testproxy build and deflake tests

jackdingilian · jackdingilian · commit 8ed8dae7285e · 2025-03-20T11:55:19.000-04:00
Change-Id: Iea243f2c89872f947b5b79e37fa507e403f5acea
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/PreparedStatementImplTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/PreparedStatementImplTest.java
@@ -140,6 +140,7 @@ public void testBackgroundRefresh() throws InterruptedException, ExecutionExcept
     do {
       Thread.sleep(10);
     } while (service.prepareCount < 2);
+    Thread.sleep(50);
     PreparedQueryData updatedPlan = preparedStatement.getLatestPrepareResponse();
     PrepareResponse updatedResponse = updatedPlan.prepareFuture().get();
     assertThat(updatedPlan.version()).isNotEqualTo(initialPlan.version());
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryRetryTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/sql/ExecuteQueryRetryTest.java
@@ -548,8 +548,8 @@ public void planRefreshRespectsAttemptTimeout() throws IOException {
                 // First attempt triggers plan refresh retry.
                 // Second should time out
                 .setMaxAttempts(2)
-                .setInitialRpcTimeoutDuration(Duration.ofMillis(10))
-                .setMaxRpcTimeoutDuration(Duration.ofMinutes(10))
+                .setInitialRpcTimeoutDuration(Duration.ofMillis(500))
+                .setMaxRpcTimeoutDuration(Duration.ofMinutes(500))
                 .setTotalTimeoutDuration(Duration.ZERO)
                 .build())
         .build();
@@ -699,9 +699,9 @@ public void canRetryAfterRefreshAttemptTimeout() throws IOException {
                 // First attempt triggers plan refresh retry.
                 // Second should time out, third should succeed
                 .setMaxAttempts(3)
-                .setInitialRpcTimeoutDuration(Duration.ofMillis(100))
-                .setMaxRpcTimeoutDuration(Duration.ofMillis(100))
-                .setTotalTimeoutDuration(Duration.ofMinutes(500))
+                .setInitialRpcTimeoutDuration(Duration.ofSeconds(1))
+                .setMaxRpcTimeoutDuration(Duration.ofSeconds(1))
+                .setTotalTimeoutDuration(Duration.ofSeconds(5))
                 .build())
         .build();
     settings.stubSettings().build();
@@ -724,7 +724,7 @@ public void canRetryAfterRefreshAttemptTimeout() throws IOException {
         PrepareRpcExpectation.create()
             .withSql("SELECT * FROM table")
             // first refresh attempt times out, but then it succeeds
-            .withDelay(Duration.ofMillis(150))
+            .withDelay(Duration.ofMillis(1500))
             .respondWith(
                 prepareResponse(
                     ByteString.copyFromUtf8("bar"),
@@ -756,9 +756,9 @@ public void prepareRefreshTimeIsFactoredIntoExecuteAttemptTimeout() throws IOExc
                 // First attempt triggers plan refresh retry.
                 // Second should time out, third should succeed
                 .setMaxAttempts(2)
-                .setInitialRpcTimeoutDuration(Duration.ofMillis(30))
-                .setMaxRpcTimeoutDuration(Duration.ofMillis(30))
-                .setTotalTimeoutDuration(Duration.ofMinutes(30))
+                .setInitialRpcTimeoutDuration(Duration.ofMillis(500))
+                .setMaxRpcTimeoutDuration(Duration.ofMillis(500))
+                .setTotalTimeoutDuration(Duration.ofMinutes(500))
                 .build())
         .build();
     settings.stubSettings().build();
@@ -779,16 +779,16 @@ public void prepareRefreshTimeIsFactoredIntoExecuteAttemptTimeout() throws IOExc
         PrepareRpcExpectation.create()
             .withSql("SELECT * FROM table")
             // Burn most of the execute attempt timeout and succeed
-            .withDelay(Duration.ofMillis(20))
+            .withDelay(Duration.ofMillis(350))
             .respondWith(
                 prepareResponse(
                     ByteString.copyFromUtf8("bar"),
                     metadata(columnMetadata("strCol", stringType())))));
     service.addExpectation(
         ExecuteRpcExpectation.create()
             .withPreparedQuery(ByteString.copyFromUtf8("bar"))
-            // Should timeout bc we used 20 ms on prepare refresh and have 30ms timeout
-            .withDelay(Duration.ofMillis(20))
+            // Should timeout bc we used 350 ms on prepare refresh and have 500ms timeout
+            .withDelay(Duration.ofMillis(350))
             .respondWith(partialResultSetWithToken(stringValue("s"))));
 
     PreparedStatement ps =
diff --git a/test-proxy/pom.xml b/test-proxy/pom.xml
@@ -71,9 +71,9 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.6.1</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:3.22.3:exe:osx-x86_64</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:3.22.3:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
-          <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.24.0:exe:osx-x86_64</pluginArtifact>
+          <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.24.0:exe:${os.detected.classifier}</pluginArtifact>
         </configuration>
         <executions>
           <execution>
