Mark tests using libsodiumjni as Flaky on non-M1 MacOS

VirtusLab · Dec 21, 2023 · f7465a2 · f7465a2
1 parent 26a39f4
commit f7465a2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/modules/integration/src/test/scala/scala/cli/integration/GitHubTests.scala b/modules/integration/src/test/scala/scala/cli/integration/GitHubTests.scala
@@ -52,12 +52,20 @@ class GitHubTests extends ScalaCliSuite {
     }
   }
 
+  override def munitFlakyOK =
+    TestUtil.isCI && TestUtil.isNativeCli && Properties.isMac && !TestUtil.isM1
+
   // currently having issues loading libsodium from the static launcher
   // that launcher is mainly meant to be used on CIs or from docker, missing
   // that feature shouldn't be a big deal there
   if (TestUtil.cliKind != "native-static")
-    test("create secret") {
-      createSecretTest()
+    test("create secret".flaky) {
+      try
+        createSecretTest()
+      catch {
+        case e: UnsatisfiedLinkError if e.getMessage.contains("libsodium") =>
+          fail("libsodium, couldn't be loaded")
+      }
     }
 
 }

diff --git a/modules/integration/src/test/scala/scala/cli/integration/PublishSetupTests.scala b/modules/integration/src/test/scala/scala/cli/integration/PublishSetupTests.scala
@@ -7,6 +7,7 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.transport.URIish
 
 import scala.jdk.CollectionConverters.*
+import scala.util.Properties
 import scala.util.matching.Regex
 
 class PublishSetupTests extends ScalaCliSuite {
@@ -89,6 +90,9 @@ class PublishSetupTests extends ScalaCliSuite {
       .toMap
   }
 
+  override def munitFlakyOK =
+    TestUtil.isCI && TestUtil.isNativeCli && Properties.isMac && !TestUtil.isM1
+
   test("local") {
     val expectedDirectives = Map(
       "publish.versionControl" -> Seq(s"github:$ghUserName/tests"),
@@ -131,7 +135,7 @@ class PublishSetupTests extends ScalaCliSuite {
     }
   }
 
-  test("CI") {
+  test("CI".flaky) {
     val expectedDirectives = Map(
       "publish.versionControl"    -> List(s"github:$ghUserName/tests"),
       "publish.organization"      -> List(s"io.github.$ghUserName"),
@@ -184,7 +188,7 @@ class PublishSetupTests extends ScalaCliSuite {
     }
   }
 
-  test("CI repository default") {
+  test("CI repository default".flaky) {
 
     testInputs.fromRoot { root =>
       configSetup(root / configFile, root)
@@ -303,7 +307,7 @@ class PublishSetupTests extends ScalaCliSuite {
     }
   }
 
-  test("CI GitHub") {
+  test("CI GitHub".flaky) {
     val expectedDirectives = Map(
       "publish.versionControl"    -> List(s"github:$ghUserName/tests"),
       "publish.organization"      -> List(s"io.github.$ghUserName"),