From 013e25fab9f76f0c1a00459555fe42b33f379eb9 Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <siarkowicz@google.com>
Date: Fri, 31 Mar 2023 13:23:25 +0200
Subject: [PATCH] tests/robustness: Disable testing network blackhole until
 #15595 is fixed

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
---
 tests/robustness/failpoints.go           |  8 +++++---
 tests/robustness/linearizability_test.go | 23 ++++++++++++-----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/tests/robustness/failpoints.go b/tests/robustness/failpoints.go
index 1f72ad524..9fb3d5a2b 100644
--- a/tests/robustness/failpoints.go
+++ b/tests/robustness/failpoints.go
@@ -66,8 +66,9 @@ var (
 		CompactBeforeSetFinishedCompactPanic, CompactAfterSetFinishedCompactPanic,
 		CompactBeforeCommitBatchPanic, CompactAfterCommitBatchPanic,
 		RaftBeforeLeaderSendPanic,
-		BlackholePeerNetwork,
 		DelayPeerNetwork,
+		// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed
+		//BlackholePeerNetwork,
 	}
 	RandomOneNodeClusterFailpoint   Failpoint = randomFailpoint{oneNodeClusterFailpoints}
 	RaftBeforeFollowerSendPanic     Failpoint = goPanicFailpoint{"raftBeforeFollowerSend", nil, Follower}
@@ -78,8 +79,9 @@ var (
 	RaftBeforeSaveSnapPanic         Failpoint = goPanicFailpoint{"raftBeforeSaveSnap", triggerBlackholeUntilSnapshot, Follower}
 	RaftAfterSaveSnapPanic          Failpoint = goPanicFailpoint{"raftAfterSaveSnap", triggerBlackholeUntilSnapshot, Follower}
 	RandomSnapshotFailpoint         Failpoint = randomFailpoint{[]Failpoint{
-		RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic,
-		BlackholeUntilSnapshot,
+		// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed
+		//RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic,
+		//BlackholeUntilSnapshot,
 	}}
 )
 
diff --git a/tests/robustness/linearizability_test.go b/tests/robustness/linearizability_test.go
index 8fabd7415..5619dc0b6 100644
--- a/tests/robustness/linearizability_test.go
+++ b/tests/robustness/linearizability_test.go
@@ -136,17 +136,18 @@ func TestRobustness(t *testing.T) {
 				e2e.WithSnapshotCount(100),
 			),
 		},
-		{
-			name:      "Snapshot",
-			failpoint: RandomSnapshotFailpoint,
-			traffic:   &HighTraffic,
-			config: *e2e.NewConfig(
-				e2e.WithGoFailEnabled(true),
-				e2e.WithSnapshotCount(100),
-				e2e.WithSnapshotCatchUpEntries(100),
-				e2e.WithPeerProxy(true),
-			),
-		},
+		// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed
+		//{
+		//	name:      "Snapshot",
+		//	failpoint: RandomSnapshotFailpoint,
+		//	traffic:   &HighTraffic,
+		//	config: *e2e.NewConfig(
+		//		e2e.WithGoFailEnabled(true),
+		//		e2e.WithSnapshotCount(100),
+		//		e2e.WithSnapshotCatchUpEntries(100),
+		//		e2e.WithPeerProxy(true),
+		//	),
+		//},
 	}...)
 	for _, scenario := range scenarios {
 		if scenario.traffic == nil {