Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion test/extended/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ function os::test::extended::focus () {
if [[ -n "${FOCUS:-}" ]]; then
exitstatus=0

local skip="\[Serial\]"
if [[ -n "${SKIP:-}" ]]; then
skip+="|${SKIP}"
fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to imply there was a bug of some sort?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, without this fix, ginko command will be:

ginkgo -v -noColor -focus=DNS -skip=\[Disabled:.+\]|\[Disruptive\]|\[Skipped\]|\[Slow\]|\[Flaky\]|\[local\]|\[Local\] -p -nodes=5  os::util::find::built_binary extended.test  -- -ginkgo.skip \[Serial\] -test.timeout 6h

Later ginkgo.skip option overrides the former -skip option and we do see execution of wildcard dns queries that has [Disabled:Broken] tag.

# first run anything that isn't explicitly declared [Serial], and matches the $FOCUS, in a parallel mode.
os::log::info "Running parallel tests N=${PARALLEL_NODES:-<default>} with focus ${FOCUS}"
TEST_REPORT_FILE_NAME=focus_parallel TEST_PARALLEL="${PARALLEL_NODES:-5}" os::test::extended::run -- -ginkgo.skip "\[Serial\]" -test.timeout 6h ${TEST_EXTENDED_ARGS-} || exitstatus=$?
TEST_REPORT_FILE_NAME=focus_parallel TEST_PARALLEL="${PARALLEL_NODES:-5}" os::test::extended::run -- -ginkgo.skip "${skip}" -test.timeout 6h ${TEST_EXTENDED_ARGS-} || exitstatus=$?

# Then run everything that requires serial and matches the $FOCUS, serially.
# there is bit of overlap here because not all serial tests declare [Serial], so they might have run in the
Expand Down
1 change: 1 addition & 0 deletions test/extended/util/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ var (
`Services should be able to up and down services`, // we don't have wget installed on nodes
`Network should set TCP CLOSE_WAIT timeout`, // possibly some difference between ubuntu and fedora
`should allow ingress access on one named port`, // broken even with network policy on
`should answer endpoint and wildcard queries for the cluster`, // currently not supported by dns operator https://github.com/openshift/cluster-dns-operator/issues/43

`\[NodeFeature:Sysctls\]`, // needs SCC support

Expand Down