3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-17 11:07:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

inegration: fix linting issues

Browse source
This commit is contained in:
Caleb Doxsey 2020-04-28 08:17:22 -06:00
parent cb3e78cd01
commit b11a336a33
8 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
integration/main_test.go
View file

@ -15,8 +15,6 @@ import (
"github.com/rs/zerolog/log"
)
const localHTTPSPort = 9443
var (
mainCtx context.Context
testcluster *cluster.Cluster
@ -39,8 +37,7 @@ func TestMain(m *testing.M) {
mainCtx, clearTimeout = context.WithTimeout(mainCtx, time.Minute*10)
defer clearTimeout()
_, mainTestFilePath, _, _ := runtime.Caller(0)
testcluster = cluster.New(filepath.Dir(mainTestFilePath))
testcluster = cluster.New(getBaseDir())
if err := testcluster.Setup(mainCtx); err != nil {
log.Fatal().Err(err).Send()
}
@ -50,3 +47,9 @@ func TestMain(m *testing.M) {
gocleanup.Cleanup()
os.Exit(status)
}
// getBaseDir returns the directory that main_test resides in
func getBaseDir() string {
_, file, _, _ := runtime.Caller(0) //nolint
return filepath.Dir(file)
}