remove per-test -timeout logic because it does not work

Tibor Vass · Tibor Vass · commit 8bffe9524daa · 2019-09-09T21:09:57.000Z
Signed-off-by: Tibor Vass &lt;tibor@docker.com&gt;
diff --git a/hack/ci/windows.ps1 b/hack/ci/windows.ps1
@@ -804,7 +804,6 @@ Try {
                 Write-Host -ForegroundColor Magenta "WARN: Only running integration tests matching $env:INTEGRATION_TEST_NAME"
             }
             $c += "`"-tags`" " + "`"autogen`" "
-            $c += "`"-timeout`" " + "`"10m`" "
             $c += "`"-test.timeout`" " + "`"200m`" "
     
             if ($null -ne $env:INTEGRATION_IN_CONTAINER) {
@@ -899,7 +898,6 @@ Try {
                     Write-Host -ForegroundColor Magenta "WARN: Only running LCOW integration tests matching $env:INTEGRATION_TEST_NAME"
                 }
                 $c += "`"-tags`" " + "`"autogen`" "
-                $c += "`"-timeout`" " + "`"10m`" "
                 $c += "`"-test.timeout`" " + "`"200m`" "
 
                 Write-Host -ForegroundColor Green "INFO: LCOW Integration tests being run from the host:"
diff --git a/hack/make/.integration-test-helpers b/hack/make/.integration-test-helpers
@@ -23,9 +23,10 @@ setup_integration_test_filter() {
 	fi
 	TESTFLAGS+="-test.run ${TEST_FILTER}"
 
-	local dirs=$(grep -rIlE --include '*_test.go' "func .*${TEST_FILTER}.*\(. \*testing\.T\)" ./integration*/ | xargs -I file dirname file | uniq)
+	local dirs
+	dirs=$(grep -rIlE --include '*_test.go' "func .*${TEST_FILTER}.*\(. \*testing\.T\)" ./integration*/ | xargs -I file dirname file | uniq)
 	if [ -z "${TEST_SKIP_INTEGRATION}" ]; then
-		: "${TEST_INTEGRATION_DIR:=$(echo "$dirs" | grep -v '^\./integration-cli$')"
+		: "${TEST_INTEGRATION_DIR:=$(echo "$dirs" | grep -v '^\./integration-cli$')}"
 		if [ -z "${TEST_INTEGRATION_DIR}" ]; then
 			echo "Skipping integration tests since the supplied filter \"${TEST_FILTER}\" omits all integration tests"
 			TEST_SKIP_INTEGRATION=1
@@ -67,7 +68,7 @@ run_test_integration_suites() {
 
 run_test_integration_legacy_suites() {
 	(
-		flags="-test.v -timeout=${TIMEOUT} $TESTFLAGS"
+		flags="-test.v -test.timeout=360m $TESTFLAGS"
 		cd integration-cli
 		echo "Running $PWD flags=${flags}"
 		# shellcheck disable=SC2086
diff --git a/hack/test/e2e-run.sh b/hack/test/e2e-run.sh
@@ -35,7 +35,7 @@ run_test_integration_suites() {
 
 run_test_integration_legacy_suites() {
 	(
-		flags="-test.v -timeout=${TIMEOUT:-10m} -test.timeout=360m $TESTFLAGS"
+		flags="-test.v -test.timeout=360m $TESTFLAGS"
 		cd /tests/integration-cli
 		echo "Running $PWD"
 		test_env ./test.main $flags
diff --git a/internal/test/suite/suite.go b/internal/test/suite/suite.go
@@ -4,16 +4,14 @@ package suite
 
 import (
 	"flag"
-	"fmt"
 	"reflect"
 	"runtime/debug"
 	"strings"
 	"testing"
-	"time"
 )
 
 // TimeoutFlag is the flag to set a per-test timeout when running tests. Defaults to `-timeout`.
-var TimeoutFlag = flag.Duration("timeout", 0, "per-test panic after duration `d` (default 0, timeout disabled)")
+var TimeoutFlag = flag.Duration("timeout", 0, "DO NOT USE")
 
 var typTestingT = reflect.TypeOf(new(testing.T))
 
@@ -53,32 +51,7 @@ func Run(t *testing.T, suite interface{}) {
 				}
 			}()
 
-			var timeout <-chan time.Time
-			if *TimeoutFlag > 0 {
-				timeout = time.After(*TimeoutFlag)
-			}
-			panicCh := make(chan error)
-			go func() {
-				defer func() {
-					if r := recover(); r != nil {
-						panicCh <- fmt.Errorf("test panicked: %v\n%s", r, debug.Stack())
-					} else {
-						close(panicCh)
-					}
-				}()
-				method.Func.Call([]reflect.Value{reflect.ValueOf(suite), reflect.ValueOf(t)})
-			}()
-			select {
-			case err := <-panicCh:
-				if err != nil {
-					t.Fatal(err.Error())
-				}
-			case <-timeout:
-				if timeoutSuite, ok := suite.(TimeoutTestSuite); ok {
-					timeoutSuite.OnTimeout()
-				}
-				t.Fatalf("timeout: test timed out after %s since start of test", *TimeoutFlag)
-			}
+			method.Func.Call([]reflect.Value{reflect.ValueOf(suite), reflect.ValueOf(t)})
 		})
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,6 @@ Try {`
`804`	`804`	`Write-Host -ForegroundColor Magenta "WARN: Only running integration tests matching $env:INTEGRATION_TEST_NAME"`
`805`	`805`	`}`
`806`	`806`	$c += "`"-tags`" " + "`"autogen`" "
`807`		- $c += "`"-timeout`" " + "`"10m`" "
`808`	`807`	$c += "`"-test.timeout`" " + "`"200m`" "
`809`	`808`
`810`	`809`	`if ($null -ne $env:INTEGRATION_IN_CONTAINER) {`
`@@ -899,7 +898,6 @@ Try {`
`899`	`898`	`Write-Host -ForegroundColor Magenta "WARN: Only running LCOW integration tests matching $env:INTEGRATION_TEST_NAME"`
`900`	`899`	`}`
`901`	`900`	$c += "`"-tags`" " + "`"autogen`" "
`902`		- $c += "`"-timeout`" " + "`"10m`" "
`903`	`901`	$c += "`"-test.timeout`" " + "`"200m`" "
`904`	`902`
`905`	`903`	`Write-Host -ForegroundColor Green "INFO: LCOW Integration tests being run from the host:"`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ run_test_integration_suites() {`
`35`	`35`
`36`	`36`	`run_test_integration_legacy_suites() {`
`37`	`37`	`(`
`38`		`- flags="-test.v -timeout=${TIMEOUT:-10m} -test.timeout=360m $TESTFLAGS"`
	`38`	`+ flags="-test.v -test.timeout=360m $TESTFLAGS"`
`39`	`39`	`cd /tests/integration-cli`
`40`	`40`	`echo "Running $PWD"`
`41`	`41`	`test_env ./test.main $flags`