diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2020-04-22 07:38:28 +0300 |
|---|---|---|
| committer | Vladimir Shushlin <v.shushlin@gmail.com> | 2020-05-08 15:06:07 +0300 |
| commit | c50b59d216af4d5929587e8ef5b460acbcd3cdd4 (patch) | |
| tree | 689dfbea9aaf2f1e84063b2270a4a420aa1e1ec4 /acceptance_test.go | |
| parent | b9c69dc5390d15e114d0771d2c217a4be80693b2 (diff) | |
Rename test config file
Diffstat (limited to 'acceptance_test.go')
| -rw-r--r-- | acceptance_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/acceptance_test.go b/acceptance_test.go index fe41a894..29a6928d 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -21,7 +21,7 @@ import ( ) var pagesBinary = flag.String("gitlab-pages-binary", "./gitlab-pages", "Path to the gitlab-pages binary") -var accessControlConfigFile string +var configFile string // TODO: Use TCP port 0 everywhere to avoid conflicts. The binary could output // the actual port (and type of listener) for us to read in place of the @@ -70,11 +70,11 @@ func skipUnlessEnabled(t *testing.T, conditions ...string) { func TestMain(m *testing.M) { var err error - accessControlConfigFile, err = accessControlConfig("clientID", "clientSecret", "authSecret") + configFile, err = accessControlConfig("clientID", "clientSecret", "authSecret") if err != nil { log.Fatal(err) } - defer os.Remove(accessControlConfigFile) + defer os.Remove(configFile) os.Exit(m.Run()) } @@ -695,7 +695,7 @@ func TestPrivateArtifactProxyRequest(t *testing.T) { listeners, "", certFile, - "-config="+accessControlConfigFile, + "-config="+configFile, "-artifacts-server="+artifactServerURL, "-auth-server="+testServer.URL, "-auth-redirect-uri=https://projects.gitlab-example.com/auth", |