update panic test

pingcap · Dec 25, 2019 · d090ccc · d090ccc
1 parent c2d17ac
commit d090ccc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/executor/explain.go b/executor/explain.go
@@ -74,7 +74,7 @@ func (e *ExplainExec) Next(ctx context.Context, req *chunk.Chunk) error {
 func (e *ExplainExec) generateExplainInfo(ctx context.Context) (rows [][]string, err error) {
 	closed := false
 	defer func() {
-		if !closed {
+		if !closed && e.analyzeExec != nil {
 			err = e.analyzeExec.Close()
 			closed = true
 		}

diff --git a/executor/explain_unit_test.go b/executor/explain_unit_test.go
@@ -71,16 +71,17 @@ func TestExplainAnalyzeInvokeNextAndClose(t *testing.T) {
 		explain:      nil,
 	}
 	// mockErrorOperator returns errors
-	explainExec.analyzeExec = &mockErrorOperator{baseExec, false, false}
+	mockOper := mockErrorOperator{baseExec, false, false}
+	explainExec.analyzeExec = &mockOper
 	tmpCtx := context.Background()
 	_, err := explainExec.generateExplainInfo(tmpCtx)
 
 	expectedStr := "next error, close error"
-	if err.Error() != expectedStr {
+	if err.Error() != expectedStr || !mockOper.closed {
 		t.Errorf(err.Error())
 	}
 	// mockErrorOperator panic
-	mockOper := mockErrorOperator{baseExec, true, false}
+	mockOper = mockErrorOperator{baseExec, true, false}
 	explainExec.analyzeExec = &mockOper
 	defer func() {
 		if panicErr := recover(); panicErr != nil && !mockOper.closed {