dumpling: fix unstable test TestDumpBlock (#32009)

close #32008
pingcap · Jan 27, 2022 · d9b0c3a · d9b0c3a
1 parent 6a5be6c
commit d9b0c3a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/dumpling/export/dump_test.go b/dumpling/export/dump_test.go
@@ -53,14 +53,16 @@ func TestDumpBlock(t *testing.T) {
 		time.Sleep(time.Second)
 		return context.Canceled
 	})
+
 	writerCtx := tctx.WithContext(writingCtx)
 	// simulate taskChan is full
 	taskChan := make(chan Task, 1)
 	taskChan <- &TaskDatabaseMeta{}
 	d.conf.Tables = DatabaseTables{}.AppendTable(database, nil)
 	d.conf.ServerInfo.ServerType = version.ServerTypeMySQL
-	require.ErrorIs(t, d.dumpDatabases(writerCtx, baseConn, taskChan), sqlmock.ErrCancelled)
 	require.ErrorIs(t, wg.Wait(), writerErr)
+	// if writerCtx is canceled , QuerySQL in `dumpDatabases` will return sqlmock.ErrCancelled
+	require.ErrorIs(t, d.dumpDatabases(writerCtx, baseConn, taskChan), sqlmock.ErrCancelled)
 }
 
 func TestDumpTableMeta(t *testing.T) {