Merge branch 'main' into crystal/hnt-7898-river-support-for-erc1155-t…

…okens
river-build · Jul 15, 2024 · 7ea0c42 · 7ea0c42
2 parents 4834a60 + 6f5e4ff
commit 7ea0c42
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/core/node/rpc/repl_test.go b/core/node/rpc/repl_test.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/river-build/river/core/node/crypto"
 	"github.com/river-build/river/core/node/protocol"
+	"github.com/river-build/river/core/node/testutils"
 )
 
 func TestReplCreate(t *testing.T) {
@@ -52,6 +53,8 @@ func TestReplAdd(t *testing.T) {
 }
 
 func TestReplMiniblock(t *testing.T) {
+	testutils.SkipFlackyTest(t)
+
 	tt := newServiceTester(t, serviceTesterOpts{numNodes: 5, replicationFactor: 5, start: true})
 	ctx := tt.ctx
 	require := tt.require

diff --git a/core/node/testutils/skip.go b/core/node/testutils/skip.go
@@ -0,0 +1,12 @@
+package testutils
+
+import (
+	"os"
+	"testing"
+)
+
+func SkipFlackyTest(t *testing.T) {
+	if os.Getenv("RIVER_TEST_ENABLE_FLACKY") == "" {
+		t.Skip("skipping flacky test")
+	}
+}