mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 01:40:13 +00:00
136f89dfc5
The recently introduced failure handling in ExpectNoError depends on error
wrapping: if an error prefix gets added with `fmt.Errorf("foo: %v", err)`, then
ExpectNoError cannot detect that the root cause is an assertion failure and
then will add another useless "unexpected error" prefix and will not dump the
additional failure information (currently the backtrace inside the E2E
framework).
Instead of manually deciding on a case-by-case basis where %w is needed, all
error wrapping was updated automatically with
sed -i "s/fmt.Errorf\(.*\): '*\(%s\|%v\)'*\",\(.* err)\)/fmt.Errorf\1: %w\",\3/" $(git grep -l 'fmt.Errorf' test/e2e*)
This may be unnecessary in some cases, but it's not wrong.
46 lines
1.1 KiB
Go
46 lines
1.1 KiB
Go
/*
|
|
Copyright 2018 The Kubernetes Authors.
|
|
|
|
Licensed 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 workloads
|
|
|
|
import (
|
|
"fmt"
|
|
"os/exec"
|
|
"regexp"
|
|
"strings"
|
|
)
|
|
|
|
func runCmd(cmd string, args []string) error {
|
|
err := exec.Command(cmd, args...).Run()
|
|
return err
|
|
}
|
|
|
|
func getMatchingLineFromLog(log string, pattern string) (line string, err error) {
|
|
regex, err := regexp.Compile(pattern)
|
|
if err != nil {
|
|
return line, fmt.Errorf("failed to compile regexp %v: %w", pattern, err)
|
|
}
|
|
|
|
logLines := strings.Split(log, "\n")
|
|
for _, line := range logLines {
|
|
if regex.MatchString(line) {
|
|
return line, nil
|
|
}
|
|
}
|
|
|
|
return line, fmt.Errorf("line with pattern %v not found in log", pattern)
|
|
}
|