Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeistel <6742251-feistel@users.noreply.gitlab.com>2022-07-01 18:09:08 +0300
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2022-07-01 18:09:08 +0300
commit29fb0c4e98a4a775d9af8e917730e065f7971376 (patch)
tree359fbcdd7f2ee3cfb85bb7637c32434c31d8cd82 /test/acceptance/helpers_test.go
parent30f67e89a01173207bd1e40d151c700c18ccddc7 (diff)
Add tls support to gitlab stub server
Diffstat (limited to 'test/acceptance/helpers_test.go')
-rw-r--r--test/acceptance/helpers_test.go11
1 files changed, 10 insertions, 1 deletions
diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go
index 4c365c5e..1539df01 100644
--- a/test/acceptance/helpers_test.go
+++ b/test/acceptance/helpers_test.go
@@ -247,7 +247,12 @@ func RunPagesProcess(t *testing.T, opts ...processOption) *LogCaptureBuffer {
source, err := gitlabstub.NewUnstartedServer(processCfg.gitlabStubOpts...)
require.NoError(t, err)
- source.Start()
+
+ if source.TLS != nil {
+ source.StartTLS()
+ } else {
+ source.Start()
+ }
gitLabAPISecretKey := CreateGitLabAPISecretKeyFixtureFile(t)
processCfg.extraArgs = append(
@@ -257,6 +262,10 @@ func RunPagesProcess(t *testing.T, opts ...processOption) *LogCaptureBuffer {
"-api-secret-key", gitLabAPISecretKey,
)
+ if processCfg.publicServer {
+ processCfg.extraArgs = append(processCfg.extraArgs, "-gitlab-server", source.URL)
+ }
+
logBuf, cleanup := runPagesProcess(t, processCfg.wait, processCfg.pagesBinary, processCfg.listeners, "", processCfg.envs, processCfg.extraArgs...)
t.Cleanup(func() {