diff options
author | Jaime Martinez <jmartinez@gitlab.com> | 2021-08-17 06:58:49 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2021-08-17 07:01:14 +0300 |
commit | 685af284110f55590c0288815bae80cc77cad247 (patch) | |
tree | 4e3997fc8002c9dc40b7a17dea17989276b72986 /test/acceptance/helpers_test.go | |
parent | 84d1dde7f22aad875f75c2df768f6f2984a3ef4b (diff) |
test: rename and cleanup some functions571-refactor-missing-serving-tests
Diffstat (limited to 'test/acceptance/helpers_test.go')
-rw-r--r-- | test/acceptance/helpers_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go index 4ea28b2a..c5fd8319 100644 --- a/test/acceptance/helpers_test.go +++ b/test/acceptance/helpers_test.go @@ -202,12 +202,12 @@ func (l ListenSpec) JoinHostPort() string { return net.JoinHostPort(l.Host, l.Port) } -// RunPagesProcess will start a gitlab-pages process with the specified listeners +// RunPagesProcessWithoutGitLabStub will start a gitlab-pages process with the specified listeners // and return a function you can call to shut it down again. Use // GetPageFromProcess to do a HTTP GET against a listener. // // If run as root via sudo, the gitlab-pages process will drop privileges -func RunPagesProcess(t *testing.T, pagesBinary string, listeners []ListenSpec, promPort string, extraArgs ...string) (teardown func()) { +func RunPagesProcessWithoutGitLabStub(t *testing.T, pagesBinary string, listeners []ListenSpec, promPort string, extraArgs ...string) (teardown func()) { _, cleanup := runPagesProcess(t, true, pagesBinary, listeners, promPort, nil, extraArgs...) return cleanup } @@ -217,7 +217,7 @@ func RunPagesProcessWithEnvs(t *testing.T, wait bool, pagesBinary string, listen return cleanup } -func RunPagesProcessWithStubGitLabServer(t *testing.T, opts ...processOption) *LogCaptureBuffer { +func RunPagesProcess(t *testing.T, opts ...processOption) *LogCaptureBuffer { chdir := false chdirCleanup := testhelpers.ChdirInPath(t, "../../shared/pages", &chdir) @@ -256,11 +256,11 @@ func RunPagesProcessWithStubGitLabServer(t *testing.T, opts ...processOption) *L return logBuf } -func RunPagesProcessWithGitlabServerWithSSLCertFile(t *testing.T, listeners []ListenSpec, sslCertFile string) { +func RunPagesProcessWithSSLCertFile(t *testing.T, listeners []ListenSpec, sslCertFile string) { runPagesWithAuthAndEnv(t, listeners, []string{"SSL_CERT_FILE=" + sslCertFile}) } -func RunPagesProcessWithGitlabServerWithSSLCertDir(t *testing.T, listeners []ListenSpec, sslCertFile string) { +func RunPagesProcessWithSSLCertDir(t *testing.T, listeners []ListenSpec, sslCertFile string) { // Create temporary cert dir sslCertDir, err := ioutil.TempDir("", "pages-test-SSL_CERT_DIR") require.NoError(t, err) |