opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 20:26:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor test tweaks

Browse Source 
- remove 'NO TESTS NEEDED' as a valid bypass string. Henceforth
  only 'NO NEW TESTS NEEDED' will work.

- add a debugging aid for #11871, in which bodhi tests time out
  in nslookup.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2021-11-08 13:44:03 -07:00
parent 3a31ac50da
commit 2ed31f9f1d
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/cirrus/pr-should-include-tests
View File

@ -12,9 +12,6 @@ fi
if [[ "${CIRRUS_CHANGE_MESSAGE}" =~ NO.NEW.TESTS.NEEDED ]]; then if [[ "${CIRRUS_CHANGE_MESSAGE}" =~ NO.NEW.TESTS.NEEDED ]]; then
exit 0 exit 0
fi fi
if [[ "${CIRRUS_CHANGE_MESSAGE}" =~ NO.TESTS.NEEDED ]]; then
exit 0
fi
# HEAD should be good enough, but the CIRRUS envariable allows us to test # HEAD should be good enough, but the CIRRUS envariable allows us to test
head=${CIRRUS_CHANGE_IN_REPO:-HEAD} head=${CIRRUS_CHANGE_IN_REPO:-HEAD}
@ -52,14 +49,11 @@ if [[ -z "$filtered_changes" ]]; then
exit 0 exit 0
fi fi
# One last chance: perhaps the developer included the magic '[NO (NEW) TESTS NEEDED]' # One last chance: perhaps the developer included the magic '[NO NEW TESTS NEEDED]'
# string in an amended commit. # string in an amended commit.
if git log --format=%B ${base}..${head} | fgrep '[NO NEW TESTS NEEDED]'; then if git log --format=%B ${base}..${head} | fgrep '[NO NEW TESTS NEEDED]'; then
exit 0 exit 0
fi fi
if git log --format=%B ${base}..${head} | fgrep '[NO TESTS NEEDED]'; then
exit 0
fi
cat <<EOF cat <<EOF
$(basename $0): PR does not include changes in the 'tests' directory $(basename $0): PR does not include changes in the 'tests' directory

7
test/system/500-networking.bats
View File

@ -167,6 +167,13 @@ load helpers
$IMAGE nc -l -n -v -p $myport $IMAGE nc -l -n -v -p $myport
cid="$output" cid="$output"
# FIXME: debugging for #11871
run_podman exec $cid cat /etc/resolv.conf
if is_rootless; then
run_podman unshare --rootless-cni cat /etc/resolv.conf
fi
ps uxww
# check that dns is working inside the container # check that dns is working inside the container
run_podman exec $cid nslookup google.com run_podman exec $cid nslookup google.com