diff options
author | feistel <6742251-feistel@users.noreply.gitlab.com> | 2022-07-01 20:21:43 +0300 |
---|---|---|
committer | feistel <6742251-feistel@users.noreply.gitlab.com> | 2022-07-04 15:09:55 +0300 |
commit | e1f6b6c7593141fa78c5815cc8e3cf04c45f2d78 (patch) | |
tree | 95d2c4d9afbfd2ec7f6fbd729ed2090957bb4f6b /test/acceptance/helpers_test.go | |
parent | ece2a232bafa09a1f037de514899003cc5b364d2 (diff) |
Replace custom extraEnv with native t.setEnv
Diffstat (limited to 'test/acceptance/helpers_test.go')
-rw-r--r-- | test/acceptance/helpers_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go index ba6443e0..f8638e36 100644 --- a/test/acceptance/helpers_test.go +++ b/test/acceptance/helpers_test.go @@ -269,7 +269,7 @@ func RunPagesProcess(t *testing.T, opts ...processOption) *LogCaptureBuffer { processCfg.extraArgs = append(processCfg.extraArgs, "-gitlab-server", source.URL) } - logBuf, cleanup := runPagesProcess(t, processCfg.wait, processCfg.pagesBinary, processCfg.listeners, "", processCfg.envs, processCfg.extraArgs...) + logBuf, cleanup := runPagesProcess(t, processCfg.wait, processCfg.pagesBinary, processCfg.listeners, "", processCfg.extraArgs...) t.Cleanup(func() { source.Close() @@ -281,12 +281,13 @@ func RunPagesProcess(t *testing.T, opts ...processOption) *LogCaptureBuffer { } func RunPagesProcessWithSSLCertFile(t *testing.T, listeners []ListenSpec, sslCertFile string) { + t.Setenv("SSL_CERT_FILE", sslCertFile) + RunPagesProcess(t, withListeners(listeners), withArguments([]string{ "-config=" + defaultAuthConfig(t), }), - withEnv([]string{"SSL_CERT_FILE=" + sslCertFile}), ) } @@ -294,6 +295,8 @@ func RunPagesProcessWithSSLCertDir(t *testing.T, listeners []ListenSpec, sslCert // Create temporary cert dir sslCertDir := t.TempDir() + t.Setenv("SSL_CERT_DIR", sslCertDir) + // Copy sslCertFile into temp cert dir err := copyFile(sslCertDir+"/"+path.Base(sslCertFile), sslCertFile) require.NoError(t, err) @@ -303,11 +306,10 @@ func RunPagesProcessWithSSLCertDir(t *testing.T, listeners []ListenSpec, sslCert withArguments([]string{ "-config=" + defaultAuthConfig(t), }), - withEnv([]string{"SSL_CERT_DIR=" + sslCertDir}), ) } -func runPagesProcess(t *testing.T, wait bool, pagesBinary string, listeners []ListenSpec, promPort string, extraEnv []string, extraArgs ...string) (*LogCaptureBuffer, func()) { +func runPagesProcess(t *testing.T, wait bool, pagesBinary string, listeners []ListenSpec, promPort string, extraArgs ...string) (*LogCaptureBuffer, func()) { t.Helper() _, err := os.Stat(pagesBinary) @@ -318,7 +320,6 @@ func runPagesProcess(t *testing.T, wait bool, pagesBinary string, listeners []Li args := getPagesArgs(t, listeners, promPort, extraArgs) cmd := exec.Command(pagesBinary, args...) - cmd.Env = append(os.Environ(), extraEnv...) cmd.Stdout = out cmd.Stderr = out require.NoError(t, cmd.Start()) |