Revert "tests/robustness: Disable testing network blackhole until etc…

…d-io#15595 is fixed" This reverts commit 013e25f. Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
serathius · Apr 1, 2023 · 2d9e35b · 2d9e35b
1 parent e551d4a
commit 2d9e35b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/tests/robustness/failpoints.go b/tests/robustness/failpoints.go
@@ -66,9 +66,8 @@ 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}
@@ -79,9 +78,8 @@ var (
 	RaftBeforeSaveSnapPanic         Failpoint = goPanicFailpoint{"raftBeforeSaveSnap", triggerBlackholeUntilSnapshot, Follower}
 	RaftAfterSaveSnapPanic          Failpoint = goPanicFailpoint{"raftAfterSaveSnap", triggerBlackholeUntilSnapshot, Follower}
 	RandomSnapshotFailpoint         Failpoint = randomFailpoint{[]Failpoint{
-		// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed
-		//RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic,
-		//BlackholeUntilSnapshot,
+		RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic,
+		BlackholeUntilSnapshot,
 	}}
 )
 

diff --git a/tests/robustness/linearizability_test.go b/tests/robustness/linearizability_test.go
@@ -137,18 +137,18 @@ func TestRobustness(t *testing.T) {
 				e2e.WithSnapshotCount(100),
 			),
 		},
-		// 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),
-		//	),
-		//},
+		{
+			name:      "Snapshot",
+			failpoint: RandomSnapshotFailpoint,
+			traffic:   &HighTraffic,
+			config: *e2e.NewConfig(
+				e2e.WithGoFailEnabled(true),
+				e2e.WithSnapshotCount(100),
+				e2e.WithSnapshotCatchUpEntries(100),
+				e2e.WithPeerProxy(true),
+				e2e.WithIsPeerTLS(true),
+			),
+		},
 	}...)
 	for _, scenario := range scenarios {
 		if scenario.traffic == nil {