fix: tests

Author: Sattvik

src/test/java/io/supertokens/storage/postgresql/test/ConfigTest.java

@@ -120,18 +120,18 @@ public void testThatInvalidConfigThrowsRightError() throws Exception {
     public void testThatMissingConfigFileThrowsError() throws Exception {
         String[] args = {"../"};
 
+        TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
+
         String workerId = System.getProperty("org.gradle.test.worker");
         ProcessBuilder pb = new ProcessBuilder("rm", "-r", "config" + workerId + ".yaml");
         pb.directory(new File(args[0]));
         Process process1 = pb.start();
         process1.waitFor();
 
-        TestingProcessManager.TestingProcess process = TestingProcessManager.start(args);
-
         ProcessState.EventAndException e = process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.INIT_FAILURE);
         assertNotNull(e);
         TestCase.assertEquals(e.exception.getMessage(),
-                "config" + workerId + ".yaml (No such file or directory)");
+                "../config" + workerId + ".yaml (No such file or directory)");
 
         process.kill();
         assertNotNull(process.checkOrWaitForEvent(ProcessState.PROCESS_STATE.STOPPED));

src/test/java/io/supertokens/storage/postgresql/test/Utils.java

@@ -26,6 +26,7 @@
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
 import org.mockito.Mockito;
 
 import javax.net.ssl.HttpsURLConnection;
@@ -35,6 +36,7 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
 
 public abstract class Utils extends Mockito {
 
@@ -189,4 +191,38 @@ protected void failed(Throwable e, Description description) {
         };
     }
 
+    public static TestRule retryFlakyTest() {
+        return new TestRule() {
+            private final int retryCount = 10;
+
+            public Statement apply(Statement base, Description description) {
+                return statement(base, description);
+            }
+
+            private Statement statement(final Statement base, final Description description) {
+                return new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        Throwable caughtThrowable = null;
+
+                        // implement retry logic here
+                        for (int i = 0; i < retryCount; i++) {
+                            try {
+                                base.evaluate();
+                                return;
+                            } catch (Throwable t) {
+                                caughtThrowable = t;
+                                System.err.println(description.getDisplayName() + ": run " + (i+1) + " failed");
+                                TestingProcessManager.killAll();
+                                Thread.sleep(1000 + new Random().nextInt(3000));
+                            }
+                        }
+                        System.err.println(description.getDisplayName() + ": giving up after " + retryCount + " failures");
+                        throw caughtThrowable;
+                    }
+                };
+            }
+        };
+    }
+
 }

src/test/java/io/supertokens/storage/postgresql/test/multitenancy/TestForNoCrashDuringStartup.java

@@ -41,10 +41,8 @@
 import io.supertokens.storageLayer.StorageLayer;
 import io.supertokens.thirdparty.InvalidProviderConfigException;
 import io.supertokens.utils.SemVer;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
+import org.junit.rules.TestRule;
 
 import java.io.IOException;
 
@@ -54,6 +52,9 @@
 public class TestForNoCrashDuringStartup {
     TestingProcessManager.TestingProcess process;
 
+    @Rule
+    public TestRule retryFlaky = Utils.retryFlakyTest();
+
     @AfterClass
     public static void afterTesting() {
         Utils.afterTesting();