Integration tests: speed up filtered runs

evanelias · evanelias · commit f85849ef0be2 · 2019-10-08T16:31:09.000-04:00
Golang supports `go test -run ...` to filter test execution, and this can
be used to filter subtests as well. For example `go test -run Integ/Handler`
will only run integration tests containing the word Handler in the test
method name.

Previously this was rather slow, because the integration test suite's
BeforeTest() method was still executed for every skipped test. This commit
updates dep github.com/skeema/tengo to add logic preventing unnecessary
redundant BeforeTest() calls.
diff --git a/applier/applier_test.go b/applier/applier_test.go
@@ -94,7 +94,7 @@ func (s *ApplierIntegrationSuite) Teardown(backend string) error {
 	return g.Wait()
 }
 
-func (s *ApplierIntegrationSuite) BeforeTest(method string, backend string) error {
+func (s *ApplierIntegrationSuite) BeforeTest(backend string) error {
 	var g errgroup.Group
 	for n := range s.d {
 		n := n
diff --git a/dumper/dumper_test.go b/dumper/dumper_test.go
@@ -137,7 +137,7 @@ func (s *IntegrationSuite) Teardown(backend string) error {
 	return os.RemoveAll(s.scratchPath())
 }
 
-func (s *IntegrationSuite) BeforeTest(method string, backend string) error {
+func (s *IntegrationSuite) BeforeTest(backend string) error {
 	if err := s.d.NukeData(); err != nil {
 		return err
 	}
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/opencontainers/selinux v1.3.0 // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/skeema/mybase v1.0.8
-	github.com/skeema/tengo v0.8.18
+	github.com/skeema/tengo v0.8.19-0.20191008200715-c840b0ecb8a2
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
 	golang.org/x/lint v0.0.0-20190409202823-959b441ac422
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
diff --git a/go.sum b/go.sum
@@ -63,6 +63,8 @@ github.com/skeema/mybase v1.0.8 h1:eqtxi5FfphYhosEEeHBsYf/9oXfwjCZ8fMnpGJ+AdxI=
 github.com/skeema/mybase v1.0.8/go.mod h1:09Uz3MIoXTNCUZWBeKDeO8SUHlQNjIEocXbc1DFvEKQ=
 github.com/skeema/tengo v0.8.18 h1:+w86N5HxvvULTLeQlgRmzjgYYamxklytpU/jnxMfPr8=
 github.com/skeema/tengo v0.8.18/go.mod h1:iz608OkLZGwQUFMwivJCldvM4sxk57p5nt9UCWyJwO0=
+github.com/skeema/tengo v0.8.19-0.20191008200715-c840b0ecb8a2 h1:rLI7qp4nehKQivZWrEEdkZMOnh+vOp61X8zjqRA3aa0=
+github.com/skeema/tengo v0.8.19-0.20191008200715-c840b0ecb8a2/go.mod h1:iz608OkLZGwQUFMwivJCldvM4sxk57p5nt9UCWyJwO0=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
diff --git a/linter/linter_test.go b/linter/linter_test.go
@@ -85,7 +85,7 @@ func (s *IntegrationSuite) Teardown(backend string) error {
 	return s.d.Stop()
 }
 
-func (s *IntegrationSuite) BeforeTest(method string, backend string) error {
+func (s *IntegrationSuite) BeforeTest(backend string) error {
 	return s.d.NukeData()
 }
 
diff --git a/skeema_test.go b/skeema_test.go
@@ -77,7 +77,7 @@ func (s *SkeemaIntegrationSuite) Teardown(backend string) error {
 	return nil
 }
 
-func (s *SkeemaIntegrationSuite) BeforeTest(method string, backend string) error {
+func (s *SkeemaIntegrationSuite) BeforeTest(backend string) error {
 	// Clear data and re-source setup data
 	if err := s.d.NukeData(); err != nil {
 		return err
diff --git a/vendor/github.com/skeema/tengo/testing.go b/vendor/github.com/skeema/tengo/testing.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,6 +1,6 @@
 # github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
-github.com/Azure/go-ansiterm
 github.com/Azure/go-ansiterm/winterm
+github.com/Azure/go-ansiterm
 # github.com/Microsoft/go-winio v0.4.7
 github.com/Microsoft/go-winio
 # github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5
@@ -13,31 +13,31 @@ github.com/alecthomas/participle/lexer
 # github.com/containerd/continuity v0.0.0-20180612233548-246e49050efd
 github.com/containerd/continuity/pathdriver
 # github.com/docker/docker v0.0.0-20180412203414-a422774e593b
-github.com/docker/docker/api/types
-github.com/docker/docker/api/types/blkiodev
-github.com/docker/docker/api/types/container
-github.com/docker/docker/api/types/filters
-github.com/docker/docker/api/types/mount
-github.com/docker/docker/api/types/network
 github.com/docker/docker/api/types/registry
-github.com/docker/docker/api/types/strslice
 github.com/docker/docker/api/types/swarm
-github.com/docker/docker/api/types/swarm/runtime
-github.com/docker/docker/api/types/versions
 github.com/docker/docker/opts
 github.com/docker/docker/pkg/archive
 github.com/docker/docker/pkg/fileutils
 github.com/docker/docker/pkg/homedir
+github.com/docker/docker/pkg/jsonmessage
+github.com/docker/docker/pkg/stdcopy
+github.com/docker/docker/api/types/container
+github.com/docker/docker/api/types/mount
+github.com/docker/docker/api/types/network
+github.com/docker/docker/api/types/swarm/runtime
+github.com/docker/docker/api/types
 github.com/docker/docker/pkg/idtools
 github.com/docker/docker/pkg/ioutils
-github.com/docker/docker/pkg/jsonmessage
 github.com/docker/docker/pkg/longpath
-github.com/docker/docker/pkg/mount
 github.com/docker/docker/pkg/pools
-github.com/docker/docker/pkg/stdcopy
 github.com/docker/docker/pkg/system
 github.com/docker/docker/pkg/term
+github.com/docker/docker/api/types/blkiodev
+github.com/docker/docker/api/types/strslice
+github.com/docker/docker/api/types/filters
+github.com/docker/docker/pkg/mount
 github.com/docker/docker/pkg/term/windows
+github.com/docker/docker/api/types/versions
 # github.com/docker/go-connections v0.3.0
 github.com/docker/go-connections/nat
 # github.com/docker/go-units v0.3.3
@@ -62,8 +62,8 @@ github.com/nozzle/throttler
 # github.com/opencontainers/go-digest v1.0.0-rc1
 github.com/opencontainers/go-digest
 # github.com/opencontainers/image-spec v1.0.1
-github.com/opencontainers/image-spec/specs-go
 github.com/opencontainers/image-spec/specs-go/v1
+github.com/opencontainers/image-spec/specs-go
 # github.com/opencontainers/runc v1.0.0-rc5
 github.com/opencontainers/runc/libcontainer/system
 github.com/opencontainers/runc/libcontainer/user
@@ -75,13 +75,13 @@ github.com/pmezard/go-difflib/difflib
 github.com/sirupsen/logrus
 # github.com/skeema/mybase v1.0.8
 github.com/skeema/mybase
-# github.com/skeema/tengo v0.8.18
+# github.com/skeema/tengo v0.8.19-0.20191008200715-c840b0ecb8a2
 github.com/skeema/tengo
 # golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
 golang.org/x/crypto/ssh/terminal
 # golang.org/x/lint v0.0.0-20190409202823-959b441ac422
-golang.org/x/lint
 golang.org/x/lint/golint
+golang.org/x/lint
 # golang.org/x/net v0.0.0-20190620200207-3b0461eec859
 golang.org/x/net/context
 # golang.org/x/sync v0.0.0-20190423024810-112230192c58
diff --git a/workspace/workspace_test.go b/workspace/workspace_test.go
@@ -289,7 +289,7 @@ func (s *WorkspaceIntegrationSuite) Teardown(backend string) error {
 	return s.d.Stop()
 }
 
-func (s *WorkspaceIntegrationSuite) BeforeTest(method string, backend string) error {
+func (s *WorkspaceIntegrationSuite) BeforeTest(backend string) error {
 	return s.d.NukeData()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (s *ApplierIntegrationSuite) Teardown(backend string) error {`
`94`	`94`	`return g.Wait()`
`95`	`95`	`}`
`96`	`96`
`97`		`-func (s *ApplierIntegrationSuite) BeforeTest(method string, backend string) error {`
	`97`	`+func (s *ApplierIntegrationSuite) BeforeTest(backend string) error {`
`98`	`98`	`var g errgroup.Group`
`99`	`99`	`for n := range s.d {`
`100`	`100`	`n := n`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ func (s *IntegrationSuite) Teardown(backend string) error {`
`137`	`137`	`return os.RemoveAll(s.scratchPath())`
`138`	`138`	`}`
`139`	`139`
`140`		`-func (s *IntegrationSuite) BeforeTest(method string, backend string) error {`
	`140`	`+func (s *IntegrationSuite) BeforeTest(backend string) error {`
`141`	`141`	`if err := s.d.NukeData(); err != nil {`
`142`	`142`	`return err`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func (s *IntegrationSuite) Teardown(backend string) error {`
`85`	`85`	`return s.d.Stop()`
`86`	`86`	`}`
`87`	`87`
`88`		`-func (s *IntegrationSuite) BeforeTest(method string, backend string) error {`
	`88`	`+func (s *IntegrationSuite) BeforeTest(backend string) error {`
`89`	`89`	`return s.d.NukeData()`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func (s *SkeemaIntegrationSuite) Teardown(backend string) error {`
`77`	`77`	`return nil`
`78`	`78`	`}`
`79`	`79`
`80`		`-func (s *SkeemaIntegrationSuite) BeforeTest(method string, backend string) error {`
	`80`	`+func (s *SkeemaIntegrationSuite) BeforeTest(backend string) error {`
`81`	`81`	`// Clear data and re-source setup data`
`82`	`82`	`if err := s.d.NukeData(); err != nil {`
`83`	`83`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ func (s *WorkspaceIntegrationSuite) Teardown(backend string) error {`
`289`	`289`	`return s.d.Stop()`
`290`	`290`	`}`
`291`	`291`
`292`		`-func (s *WorkspaceIntegrationSuite) BeforeTest(method string, backend string) error {`
	`292`	`+func (s *WorkspaceIntegrationSuite) BeforeTest(backend string) error {`
`293`	`293`	`return s.d.NukeData()`
`294`	`294`	`}`
`295`	`295`