Merge pull request #31533 from deads2k/partial-test-integration

Automatic merge from submit-queue

choose a particular directory test-integration

Enables `make test-integration WHAT=auth` or whatever particular integration test director you want to run.
This commit is contained in:
Kubernetes Submit Queue
2016-09-07 19:16:07 -07:00
committed by GitHub
3 changed files with 16 additions and 9 deletions

View File

@@ -40,7 +40,7 @@ KUBE_TEST_ARGS=${KUBE_TEST_ARGS:-}
kube::test::find_integration_test_dirs() {
(
cd ${KUBE_ROOT}
find test/integration -name '*_test.go' -print0 \
find test/integration/${1-} -name '*_test.go' -print0 \
| xargs -0n1 dirname \
| sort -u
)
@@ -60,7 +60,7 @@ runTests() {
# TODO: Re-enable race detection when we switch to a thread-safe etcd client
# KUBE_RACE="-race"
make -C "${KUBE_ROOT}" test \
WHAT="$(kube::test::find_integration_test_dirs | paste -sd' ' -)" \
WHAT="$(kube::test::find_integration_test_dirs ${2-} | paste -sd' ' -)" \
KUBE_GOFLAGS="${KUBE_GOFLAGS:-} -tags 'integration no-docker'" \
KUBE_TEST_ARGS="--vmodule=garbage*collector=6" \
KUBE_RACE="" \
@@ -91,5 +91,5 @@ fi
# Convert the CSV to an array of API versions to test
IFS=';' read -a apiVersions <<< "${KUBE_TEST_API_VERSIONS}"
for apiVersion in "${apiVersions[@]}"; do
runTests "${apiVersion}"
runTests "${apiVersion}" "${1-}"
done