Skip to content

Commit 3c2fee5

Browse files
authored
Fix regexp in sanity check for log message case (#913)
* pkg/*: fix test log message cases * hack/check_error_log_msg_format.sh: fix log case regexp to match anything but "fmt.Error(f)?.*"
1 parent 3946c58 commit 3c2fee5

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Diff for: hack/check_error_log_msg_format.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source "hack/lib/test_lib.sh"
77

88
echo "Checking format of error and log messages..."
99
allfiles=$(listFiles)
10-
log_case_output=$(grep -ERn '(Error\((.*[Ee]rr|nil), |[^(fmt\.)]Error(f)?\(|Fatal(f)?\(|Info(f)?\(|Warn(f)?\()"[[:lower:]]' $allfiles | sort -u)
10+
log_case_output=$(grep -PRn '(Error\((.*[Ee]rr|nil), |^(?!.*fmt).+\.Error(f)?\(|Fatal(f)?\(|Info(f)?\(|Warn(f)?\()"[[:lower:]]' $allfiles | sort -u)
1111
if [ -n "${log_case_output}" ]; then
1212
echo -e "Log messages do not begin with upper case:\n${log_case_output}"
1313
fi

Diff for: pkg/k8sutil/k8sutil_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestGetOperatorName(t *testing.T) {
6868
_ = os.Setenv(test.envVarKey, test.envVarValue)
6969
operatorName, err := GetOperatorName()
7070
if !(operatorName == test.expectedOutput.operatorName && reflect.DeepEqual(err, test.expectedOutput.err)) {
71-
t.Errorf("test %s failed, expected ouput: %s,%v; got: %s,%v", test.name, test.expectedOutput.operatorName, test.expectedOutput.err, operatorName, err)
71+
t.Errorf("Test %s failed, expected ouput: %s,%v; got: %s,%v", test.name, test.expectedOutput.operatorName, test.expectedOutput.err, operatorName, err)
7272
}
7373
_ = os.Unsetenv(test.envVarKey)
7474
}

Diff for: pkg/ready/ready_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@ func TestFileReady(t *testing.T) {
2323
r := NewFileReady()
2424
err := r.Set()
2525
if err != nil {
26-
t.Errorf("could not set ready file: %v", err)
26+
t.Errorf("Could not set ready file: %v", err)
2727
}
2828

2929
_, err = os.Stat(FileName)
3030
if err != nil {
31-
t.Errorf("did not find expected file at %s: %v", FileName, err)
31+
t.Errorf("Did not find expected file at %s: %v", FileName, err)
3232
}
3333

3434
err = r.Unset()
3535
if err != nil {
36-
t.Errorf("could not unset ready file: %v", err)
36+
t.Errorf("Could not unset ready file: %v", err)
3737
}
3838

3939
_, err = os.Stat(FileName)
4040
if err == nil {
41-
t.Errorf("file still exists at %s", FileName)
41+
t.Errorf("File still exists at %s", FileName)
4242
}
4343
if !os.IsNotExist(err) {
44-
t.Errorf("error determining if file still exists at %s: %v", FileName, err)
44+
t.Errorf("Error determining if file still exists at %s: %v", FileName, err)
4545
}
4646
}

0 commit comments

Comments
 (0)