From b4ac128673bbe4e3cae7815d58004b196cd9551c Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Thu, 15 Sep 2022 17:48:09 +0300 Subject: [PATCH] Create a testing package for common utilities Signed-off-by: Gabriel Adrian Samfira --- Makefile | 4 +--- database/sql/controller_test.go | 4 ++-- util/tests_util.go => internal/testing/testing.go | 5 ++++- runner/organizations_test.go | 4 ++-- runner/repositories_test.go | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) rename util/tests_util.go => internal/testing/testing.go (95%) diff --git a/Makefile b/Makefile index f069fe2e..83b75ef2 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,6 @@ IMAGE_TAG = garm-build USER_ID=$(shell ((docker --version | grep -q podman) && echo "0" || id -u)) USER_GROUP=$(shell ((docker --version | grep -q podman) && echo "0" || id -g)) -GO_PACKAGES?=$(shell (go list ./... | grep -v 'vendor')) - default: build-static .PHONY : build-static @@ -18,4 +16,4 @@ build-static: .PHONY: test test: - go test $(GO_PACKAGES) -v $(TEST_ARGS) -timeout=15m -parallel=4 + go test -mod=vendor -tags testing -v $(TEST_ARGS) -timeout=15m -parallel=4 ./... diff --git a/database/sql/controller_test.go b/database/sql/controller_test.go index 274150e7..0803da1f 100644 --- a/database/sql/controller_test.go +++ b/database/sql/controller_test.go @@ -19,7 +19,7 @@ import ( "fmt" dbCommon "garm/database/common" runnerErrors "garm/errors" - "garm/util" + garmTesting "garm/internal/testing" "testing" "github.com/stretchr/testify/suite" @@ -31,7 +31,7 @@ type CtrlTestSuite struct { } func (s *CtrlTestSuite) SetupTest() { - db, err := NewSQLDatabase(context.Background(), util.GetTestSqliteDBConfig(s.T())) + db, err := NewSQLDatabase(context.Background(), garmTesting.GetTestSqliteDBConfig(s.T())) if err != nil { s.FailNow(fmt.Sprintf("failed to create db connection: %s", err)) } diff --git a/util/tests_util.go b/internal/testing/testing.go similarity index 95% rename from util/tests_util.go rename to internal/testing/testing.go index 84fb9a14..7ae23b2d 100644 --- a/util/tests_util.go +++ b/internal/testing/testing.go @@ -12,7 +12,10 @@ // License for the specific language governing permissions and limitations // under the License. -package util +//go:build testing +// +build testing + +package testing import ( "garm/config" diff --git a/runner/organizations_test.go b/runner/organizations_test.go index 6270211a..bcc17ac7 100644 --- a/runner/organizations_test.go +++ b/runner/organizations_test.go @@ -22,11 +22,11 @@ import ( "garm/database" dbCommon "garm/database/common" runnerErrors "garm/errors" + garmTesting "garm/internal/testing" "garm/params" "garm/runner/common" runnerCommonMocks "garm/runner/common/mocks" runnerMocks "garm/runner/mocks" - "garm/util" "sort" "testing" @@ -104,7 +104,7 @@ func (s *OrgTestSuite) SetupTest() { adminCtx := auth.GetAdminContext() // create testing sqlite database - dbCfg := util.GetTestSqliteDBConfig(s.T()) + dbCfg := garmTesting.GetTestSqliteDBConfig(s.T()) db, err := database.NewDatabase(adminCtx, dbCfg) if err != nil { s.FailNow(fmt.Sprintf("failed to create db connection: %s", err)) diff --git a/runner/repositories_test.go b/runner/repositories_test.go index 0cfb4dc2..395d3312 100644 --- a/runner/repositories_test.go +++ b/runner/repositories_test.go @@ -22,11 +22,11 @@ import ( "garm/database" dbCommon "garm/database/common" runnerErrors "garm/errors" + garmTesting "garm/internal/testing" "garm/params" "garm/runner/common" runnerCommonMocks "garm/runner/common/mocks" runnerMocks "garm/runner/mocks" - "garm/util" "sort" "testing" @@ -103,7 +103,7 @@ func (s *RepoTestSuite) SetupTest() { adminCtx := auth.GetAdminContext() // create testing sqlite database - dbCfg := util.GetTestSqliteDBConfig(s.T()) + dbCfg := garmTesting.GetTestSqliteDBConfig(s.T()) db, err := database.NewDatabase(adminCtx, dbCfg) if err != nil { s.FailNow(fmt.Sprintf("failed to create db connection: %s", err))