chore(functions): fix flaky tests + update dir property (GoogleCloudPlatform#5305)

Ace Nassri · web-flow · commit 65367c765e32 · 2021-05-26T13:20:28.000-07:00
* chore(functions): fix flaky tests + update dir property

* Remove debugging change

* Add requested comment

* Double underscore -&gt; single letter param
diff --git a/functions/helloworld/hello-gcs/src/test/java/functions/ExampleIT.java b/functions/helloworld/hello-gcs/src/test/java/functions/ExampleIT.java
@@ -55,7 +55,7 @@ public class ExampleIT {
   @BeforeClass
   public static void setUp() throws IOException {
     // Get the sample's base directory (the one containing a pom.xml file)
-    String baseDir = System.getProperty("basedir");
+    String baseDir = System.getProperty("user.dir");
 
     // Emulate the function locally by running the Functions Framework Maven plugin
     emulatorProcess = new ProcessBuilder()
@@ -93,6 +93,15 @@ public void helloGcs_shouldRunWithFunctionsFramework() throws Throwable {
     RetryRegistry registry = RetryRegistry.of(RetryConfig.custom()
         .maxAttempts(8)
         .retryExceptions(HttpHostConnectException.class)
+        .retryOnResult(u -> {
+          // Retry if the Functions Framework process has no stdout content
+          // See `retryOnResultPredicate` here: https://resilience4j.readme.io/docs/retry
+          try {
+            return emulatorProcess.getErrorStream().available() == 0;
+          } catch (IOException e) {
+            return true;
+          }
+        })
         .intervalFunction(IntervalFunction.ofExponentialBackoff(200, 2))
         .build());
     Retry retry = registry.retry("my");
diff --git a/functions/helloworld/hello-http/src/test/java/functions/ExampleIT.java b/functions/helloworld/hello-http/src/test/java/functions/ExampleIT.java
@@ -49,7 +49,7 @@ public class ExampleIT {
   @BeforeClass
   public static void setUp() throws IOException {
     // Get the sample's base directory (the one containing a pom.xml file)
-    String baseDir = System.getProperty("basedir");
+    String baseDir = System.getProperty("user.dir");
 
     // Emulate the function locally by running the Functions Framework Maven plugin
     emulatorProcess = new ProcessBuilder()
@@ -72,10 +72,12 @@ public void helloHttp_shouldRunWithFunctionsFramework() throws Throwable {
 
     // The Functions Framework Maven plugin process takes time to start up
     // Use resilience4j to retry the test HTTP request until the plugin responds
+    // See `retryOnResultPredicate` here: https://resilience4j.readme.io/docs/retry
     RetryRegistry registry = RetryRegistry.of(RetryConfig.custom()
         .maxAttempts(8)
         .intervalFunction(IntervalFunction.ofExponentialBackoff(200, 2))
         .retryExceptions(IOException.class)
+        .retryOnResult(body -> body.toString().length() == 0)
         .build());
     Retry retry = registry.retry("my");
 
diff --git a/functions/helloworld/hello-pubsub/src/test/java/functions/ExampleIT.java b/functions/helloworld/hello-pubsub/src/test/java/functions/ExampleIT.java
@@ -56,7 +56,7 @@ public class ExampleIT {
   @BeforeClass
   public static void setUp() throws IOException {
     // Get the sample's base directory (the one containing a pom.xml file)
-    String baseDir = System.getProperty("basedir");
+    String baseDir = System.getProperty("user.dir");
 
     // Emulate the function locally by running the Functions Framework Maven plugin
     emulatorProcess = new ProcessBuilder()
@@ -91,6 +91,15 @@ public void helloPubSub_shouldRunWithFunctionsFramework() throws Throwable {
     RetryRegistry registry = RetryRegistry.of(RetryConfig.custom()
         .maxAttempts(8)
         .retryExceptions(HttpHostConnectException.class)
+        .retryOnResult(u -> {
+          // Retry if the Functions Framework process has no stdout content
+          // See `retryOnResultPredicate` here: https://resilience4j.readme.io/docs/retry
+          try {
+            return emulatorProcess.getErrorStream().available() == 0;
+          } catch (IOException e) {
+            return true;
+          }
+        })
         .intervalFunction(IntervalFunction.ofExponentialBackoff(200, 2))
         .build());
     Retry retry = registry.retry("my");
