fix (#808)

test/e2e/chaos/chaos.go

@@ -1,3 +1,17 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 package chaos
 
 import (

test/e2e/scaffold/scaffold.go

@@ -396,13 +396,14 @@ func (s *Scaffold) afterEach() {
 func runWithRecover(f func()) {
 	defer func() {
 		r := recover()
-		if r != nil {
-			err, ok := r.(error)
-			if ok {
-				// just ignore already closed channel
-				if strings.Contains(err.Error(), "close of closed channel") {
-					return
-				}
+		if r == nil {
+			return
+		}
+		err, ok := r.(error)
+		if ok {
+			// just ignore already closed channel
+			if strings.Contains(err.Error(), "close of closed channel") {
+				return
 			}
 		}
 		panic(r)