Skip to content

Commit

Permalink
CI: unskip tests
Browse files Browse the repository at this point in the history
New VMs have netavark 1.9, which fixes the "cannot talk to syslog"
warning when running containerized, so we can reenable clean-output
checks in containerized e2e tests

pasta: some new VMs have passt >= 2023-11-10, but f38 does not,
and f39 is unclear (my version extractor could not tell). So
I'm leaving the 20170 skip.

Debian runc now supports umask in *run*, but not *exec*. Even
with runc 1.1.10. And we don't even know what the situation is
on RHEL... so, run the podman-run umask tests but not exec.

Fixes: containers#19809

Signed-off-by: Ed Santiago <[email protected]>
  • Loading branch information
edsantiago committed Dec 8, 2023
1 parent d513749 commit c823d49
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
11 changes: 9 additions & 2 deletions test/system/075-exec.bats
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,21 @@ load helpers
}

@test "podman run umask" {
test "$(podman_runtime)" == "crun" \
|| skip "FIXME: runtime is $(podman_runtime); this test requires crun or runc 1.1.7 or newer which is not currently in debian"
umask="0724"
run_podman run --rm -q $IMAGE grep Umask /proc/self/status
is "$output" "Umask:.*0022" "default_umask should not be modified"

run_podman run -q --rm --umask $umask $IMAGE grep Umask /proc/self/status
is "$output" "Umask:.*$umask" "umask should be modified"

# FIXME: even in December 2023, exec test fails with Debian runc (1.1.10).
# And even if we some day get a fixed version on Debian, these tests have
# to pass on RHEL, and we have no control over runc version there.
if [[ "$(podman_runtime)" == "runc" ]]; then
echo "# Passed run test; skipping exec because runtime != crun" >&3
return
fi

run_podman run -q -d --umask $umask $IMAGE sleep inf
cid=$output
run_podman exec $cid grep Umask /proc/self/status
Expand Down
7 changes: 0 additions & 7 deletions test/utils/matchers.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,6 @@ func (matcher *exitCleanlyMatcher) Match(actual interface{}) (success bool, err
}

// Exit status is 0. Now check for anything on stderr... except:

if Containerized() {
// FIXME: #19809, "failed to connect to syslog" warnings on f38
// FIXME: so, until that is fixed, don't check stderr if containerized
return true, nil
}

info := GetHostDistributionInfo()
if info.Distribution != "fedora" {
// runc on debian:
Expand Down

0 comments on commit c823d49

Please sign in to comment.