Skip to content

Minor test tweaks #12229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Nov 8, 2021
+8 −7
Merged

Minor test tweaks #12229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions contrib/cirrus/pr-should-include-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ fi
if [[ "${CIRRUS_CHANGE_MESSAGE}" =~ NO.NEW.TESTS.NEEDED ]]; then
exit 0
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=${CIRRUS_CHANGE_IN_REPO:-HEAD}
Expand Down Expand Up @@ -52,14 +49,11 @@ if [[ -z "$filtered_changes" ]]; then
exit 0
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.
if git log --format=%B ${base}..${head} | fgrep '[NO NEW TESTS NEEDED]'; then
exit 0
fi
if git log --format=%B ${base}..${head} | fgrep '[NO TESTS NEEDED]'; then
exit 0
fi

cat <<EOF
$(basename $0): PR does not include changes in the 'tests' directory
Expand Down
7 changes: 7 additions & 0 deletions test/system/500-networking.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,13 @@ load helpers
$IMAGE nc -l -n -v -p $myport
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
run_podman exec $cid nslookup google.com

Expand Down