update

Author: CbcWestwolf

tests/realtikvtest/addindextest2/global_sort_test.go

@@ -342,12 +342,6 @@ func TestGlobalSortDuplicateErrMsg(t *testing.T) {
 		},
 	}
 
-	checkSubtaskErr := func(t *testing.T) {
-		errorSubtask := taskexecutor.GetErrorSubtask4Test.Swap(nil)
-		require.NotEmpty(t, errorSubtask)
-		require.Equal(t, proto.BackfillStepWriteAndIngest, errorSubtask.Step)
-	}
-
 	for _, tc := range testcases {
 		t.Run(tc.caseName, func(tt *testing.T) {
 			// init
@@ -368,7 +362,13 @@ func TestGlobalSortDuplicateErrMsg(t *testing.T) {
 			}
 
 			tk.MustContainErrMsg(tc.addUniqueKeySQL, tc.errMsg)
-			checkSubtaskErr(tt)
+			errorSubtask := taskexecutor.GetErrorSubtask4Test.Swap(nil)
+			require.NotEmpty(tt, errorSubtask)
+			require.Equal(tt, proto.BackfillStepWriteAndIngest, errorSubtask.Step)
+
+			tk.MustExec("set session tidb_redact_log = on;")
+			tk.MustContainErrMsg(tc.addUniqueKeySQL, "[kv:1062]Duplicate entry '?' for key 't.idx'")
+			tk.MustExec("set session tidb_redact_log = off;")
 		})
 	}
 }