Squashed 'tools/' changes from 2b3a1bb..b783528

b783528 Tweak test script so it can be run on a mca
a3b18bf Merge pull request #65 from weaveworks/fix-integration-tests
ecb5602 Fix integration tests
f9dcbf6 ... without tab (clearly not my day)
a6215c3 Add break I forgot
0e6832d Remove incorrectly added tab
eb26c68 Merge pull request #64 from weaveworks/remove-test-package-linting
f088e83 Review feedback
2c6e83e Remove test package linting

git-subtree-dir: tools
git-subtree-split: b783528b75f6ba52a51832bd087bd8347b26f131

Author: tomwilkie

integration/config.sh

@@ -81,7 +81,8 @@ run_on() {
     host=$1
     shift 1
     [ -z "$DEBUG" ] || greyly echo "Running on $host:" "$@" >&2
-    remote "$host" "$SSH" "$host" "$@"
+    # shellcheck disable=SC2086
+    remote "$host" $SSH "$host" "$@"
 }
 
 docker_on() {
@@ -117,7 +118,8 @@ start_suite() {
         PLUGIN_ID=$(docker_on "$host" ps -aq --filter=name=weaveplugin)
         PLUGIN_FILTER="cat"
         [ -n "$PLUGIN_ID" ] && PLUGIN_FILTER="grep -v $PLUGIN_ID"
-        rm_containers "$host" "$(docker_on "$host" ps -aq 2>/dev/null | "$PLUGIN_FILTER")"
+        # shellcheck disable=SC2046
+        rm_containers "$host" $(docker_on "$host" ps -aq 2>/dev/null | $PLUGIN_FILTER)
         run_on "$host" "docker network ls | grep -q ' weave ' && docker network rm weave" || true
         weave_on "$host" reset 2>/dev/null
     done

lint

@@ -18,7 +18,6 @@
 set -e
 
 IGNORE_LINT_COMMENT=
-IGNORE_TEST_PACKAGES=
 IGNORE_SPELLINGS=
 while true; do
     case "$1" in
@@ -27,7 +26,7 @@ while true; do
             shift 1
             ;;
         -notestpackage)
-            IGNORE_TEST_PACKAGES=1
+            # NOOP, still accepted for backwards compatibility
             shift 1
             ;;
         -ignorespelling)
@@ -65,30 +64,6 @@ spell_check() {
     return $lint_result
 }
 
-test_mismatch() {
-    local filename="$1"
-    local package=$(grep '^package ' "$filename" | awk '{print $2}')
-    local lint_result=0
-
-    if [[ $package == "main" ]]; then
-        return # in package main, all bets are off
-    fi
-
-    if [[ $filename == *"_internal_test.go" ]]; then
-        if [[ $package == *"_test" ]]; then
-            lint_result=1
-            echo "${filename}: should not be part of a _test package"
-        fi
-    else
-        if [[ ! $package == *"_test" ]]; then
-            lint_result=1
-            echo "${filename}: should be part of a _test package"
-        fi
-    fi
-
-    return $lint_result
-}
-
 lint_go() {
     local filename="$1"
     local lint_result=0
@@ -183,12 +158,6 @@ lint() {
         tf) lint_tf "${filename}" || lint_result=1 ;;
     esac
 
-    if [ -z "$IGNORE_TEST_PACKAGES" ]; then
-        if [[ "$filename" == *"_test.go" ]]; then
-            test_mismatch "${filename}" || lint_result=1
-        fi
-    fi
-
     spell_check "${filename}" || lint_result=1
 
     return $lint_result

test

@@ -3,12 +3,13 @@
 set -e
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-GO_TEST_ARGS=(-tags netgo -cpu 4 -timeout 8m)
 SLOW=
-NO_GO_GET=
+NO_GO_GET=true
+TAGS=
+PARALLEL=
 
 usage() {
-    echo "$0 [-slow] [-in-container foo]"
+    echo "$0 [-slow] [-in-container foo] [-netgo] [-(no-)go-get]"
 }
 
 while [ $# -gt 0 ]; do
@@ -21,13 +22,27 @@ while [ $# -gt 0 ]; do
             NO_GO_GET=true
             shift 1
             ;;
+        "-go-get")
+            NO_GO_GET=
+            shift 1
+            ;;
+        "-netgo")
+            TAGS="-tags netgo"
+            shift 1
+            ;;
+        "-p")
+            PARALLEL=true
+            shift 1
+            ;;
         *)
             usage
             exit 2
             ;;
     esac
 done
 
+GO_TEST_ARGS=($TAGS -cpu 4 -timeout 8m)
+
 if [ -n "$SLOW" ] || [ -n "$CIRCLECI" ]; then
     SLOW=true
 fi
@@ -69,33 +84,46 @@ PACKAGE_BASE=$(go list -e ./)
 # Speed up the tests by compiling and installing their dependencies first.
 go test -i "${GO_TEST_ARGS[@]}" "${TESTDIRS[@]}"
 
-for dir in "${TESTDIRS[@]}"; do
+run_test() {
+    local dir=$1
     if [ -z "$NO_GO_GET" ]; then
-        go get -t -tags netgo "$dir"
+        go get -t $TAGS "$dir"
     fi
 
-    GO_TEST_ARGS_RUN=("${GO_TEST_ARGS[@]}")
+    local GO_TEST_ARGS_RUN=("${GO_TEST_ARGS[@]}")
     if [ -n "$SLOW" ]; then
-        COVERPKGS=$( (
+        local COVERPKGS=$( (
             go list "$dir"
             go list -f '{{join .Deps "\n"}}' "$dir" | grep -v "vendor" | grep "^$PACKAGE_BASE/"
         ) | paste -s -d, -)
-        output=$(mktemp "$coverdir/unit.XXXXXXXXXX")
-        GO_TEST_ARGS_RUN=("${GO_TEST_ARGS[@]}" -coverprofile=$output -coverpkg=$COVERPKGS)
+        local output=$(mktemp "$coverdir/unit.XXXXXXXXXX")
+        local GO_TEST_ARGS_RUN=("${GO_TEST_ARGS[@]}" -coverprofile=$output -coverpkg=$COVERPKGS)
     fi
 
-    START=$(date +%s)
+    local START=$(date +%s)
     if ! go test "${GO_TEST_ARGS_RUN[@]}" "$dir"; then
         fail=1
     fi
-    RUNTIME=$(($(date +%s) - START))
+    local RUNTIME=$(($(date +%s) - START))
 
     # Report test runtime when running on circle, to help scheduler
     if [ -n "$CIRCLECI" ] && [ -z "$NO_SCHEDULER" ] && [ -x "$DIR/sched" ]; then
         "$DIR/sched" time "$dir" "$RUNTIME"
     fi
+}
+
+for dir in "${TESTDIRS[@]}"; do
+    if [ -n "$PARALLEL" ]; then
+        run_test "$dir" &
+    else
+        run_test "$dir"
+    fi
 done
 
+if [ -n "$PARALLEL" ]; then
+    wait
+fi
+
 if [ -n "$SLOW" ] && [ -z "$COVERDIR" ]; then
     go get github.com/weaveworks/tools/cover
     cover "$coverdir"/* >profile.cov