kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #26275 from cpuguy83/verify_integration_tests

Browse source 
Fail faster if integration tests don't compile
This commit is contained in:
Vincent Demeester 2016-09-07 16:48:14 +02:00 • committed by GitHub
commit a0bbf54aa7
4 changed files with 52 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -125,7 +125,7 @@ test-docker-py: build ## run the docker-py tests
$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-docker-py $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-docker-py
test-integration-cli: build ## run the integration tests test-integration-cli: build ## run the integration tests
$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-integration-cli $(DOCKER_RUN_DOCKER) hack/make.sh build-integration-test-binary dynbinary test-integration-cli
test-unit: build ## run the unit tests test-unit: build ## run the unit tests
$(DOCKER_RUN_DOCKER) hack/make.sh test-unit $(DOCKER_RUN_DOCKER) hack/make.sh test-unit

1
hack/make.sh
View file

@ -285,7 +285,6 @@ install_binary() {
fi fi
} }
main() { main() {
# We want this to fail if the bundles already exist and cannot be removed. # We want this to fail if the bundles already exist and cannot be removed.
# This is to avoid mixing bundles from different versions of the code. # This is to avoid mixing bundles from different versions of the code.

28
hack/make/.integration-test-helpers
View file

@ -4,7 +4,7 @@
bundle_test_integration_cli() { bundle_test_integration_cli() {
TESTFLAGS="$TESTFLAGS -check.v -check.timeout=${TIMEOUT} -test.timeout=360m" TESTFLAGS="$TESTFLAGS -check.v -check.timeout=${TIMEOUT} -test.timeout=360m"
go_test_dir ./integration-cli go_test_dir integration-cli $DOCKER_INTEGRATION_TESTS_VERIFIED
} }
# If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'. # If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'.
@ -19,16 +19,17 @@ bundle_test_integration_cli() {
# #
go_test_dir() { go_test_dir() {
dir=$1 dir=$1
coverpkg=$2 precompiled=$2
testbinary="$DEST/test.main"
testcover=() testcover=()
testcoverprofile=() testcoverprofile=()
testbinary="$DEST/test.main"
( (
mkdir -p "$DEST/coverprofiles" mkdir -p "$DEST/coverprofiles"
echo '+ go test' $TESTFLAGS "${DOCKER_PKG}${dir#.}"
cd "$dir"
export DEST="$ABS_DEST" # in a subshell this is safe -- our integration-cli tests need DEST, and "cd" screws it up export DEST="$ABS_DEST" # in a subshell this is safe -- our integration-cli tests need DEST, and "cd" screws it up
go test -c -o "$testbinary" -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" if [ -z $precompiled ]; then
ensure_test_dir $1 $testbinary
fi
cd "$dir"
i=0 i=0
while ((++i)); do while ((++i)); do
test_env "$testbinary" $TESTFLAGS test_env "$testbinary" $TESTFLAGS
@ -40,7 +41,21 @@ go_test_dir() {
) )
} }
ensure_test_dir() {
(
# make sure a test dir will compile
dir="$1"
out="$2"
echo Building test dir: "$dir"
set -xe
cd "$dir"
go test -c -o "$out" -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}"
)
}
test_env() { test_env() {
(
set -xe
# use "env -i" to tightly control the environment variables that bleed into the tests # use "env -i" to tightly control the environment variables that bleed into the tests
env -i \ env -i \
DEST="$DEST" \ DEST="$DEST" \
@ -58,4 +73,5 @@ test_env() {
PATH="$PATH" \ PATH="$PATH" \
TEMP="$TEMP" \ TEMP="$TEMP" \
"$@" "$@"
)
} }

11
hack/make/build-integration-test-binary Normal file
View file

@ -0,0 +1,11 @@
#!/bin/bash
set -e
rm -rf "$DEST"
DEST="$DEST/../test-integration-cli"
if [ -z $DOCKER_INTEGRATION_TESTS_VERIFIED ]; then
source ${MAKEDIR}/.integration-test-helpers
ensure_test_dir integration-cli "$DEST/test.main"
export DOCKER_INTEGRATION_TESTS_VERIFIED=1
fi