opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-29 09:37:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: adapt tests new crun error messages

Browse Source 
Needed-by: https://github.com/containers/crun/pull/1672

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2025-02-17 09:12:31 +01:00
parent 35d2a65e3a
commit c65bb903b6
6 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/utils/matchers.go
View File

@@ -3,6 +3,7 @@ package utils
import (
"encoding/json"
"fmt"
"regexp"
"strings"
"github.com/onsi/gomega/format"
@@ -17,10 +18,11 @@ type podmanSession interface {
type ExitMatcher struct {
types.GomegaMatcher
ExpectedExitCode int
ExitCode int
ExpectedStderr string
msg string
ExpectedExitCode int
ExitCode int
ExpectedStderr string
ExpectedStderrRegex string
msg string
}
// ExitWithError checks both exit code and stderr, fails if either does not match
@@ -29,6 +31,12 @@ func ExitWithError(expectExitCode int, expectStderr string) *ExitMatcher {
return &ExitMatcher{ExpectedExitCode: expectExitCode, ExpectedStderr: expectStderr}
}
// ExitWithErrorRegex checks both exit code and the stderr regex, fails if either does not match
// Modeled after the gomega Exit() matcher and also operates on sessions.
func ExitWithErrorRegex(expectExitCode int, expectStderrRegex string) *ExitMatcher {
return &ExitMatcher{ExpectedExitCode: expectExitCode, ExpectedStderrRegex: expectStderrRegex}
}
// Match follows gexec.Matcher interface.
func (matcher *ExitMatcher) Match(actual interface{}) (success bool, err error) {
session, ok := actual.(podmanSession)
@@ -49,12 +57,23 @@ func (matcher *ExitMatcher) Match(actual interface{}) (success bool, err error)
return false, nil
}
if matcher.ExpectedStderr != "" {
switch {
case matcher.ExpectedStderrRegex != "":
matched, err := regexp.MatchString(matcher.ExpectedStderrRegex, session.ErrorToString())
if err != nil {
matcher.msg = fmt.Sprintf("Invalid regex pattern: %s", err)
return false, err
}
if !matched {
matcher.msg = fmt.Sprintf("Command exited %d as expected, but stderr did not match regex '%s'", matcher.ExitCode, matcher.ExpectedStderrRegex)
return false, nil
}
case matcher.ExpectedStderr != "":
if !strings.Contains(session.ErrorToString(), matcher.ExpectedStderr) {
matcher.msg = fmt.Sprintf("Command exited %d as expected, but did not emit '%s'", matcher.ExitCode, matcher.ExpectedStderr)
return false, nil
}
} else {
default:
if session.ErrorToString() != "" {
matcher.msg = "Command exited with expected exit status, but emitted unwanted stderr"
return false, nil