diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2021-06-07 05:02:57 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2021-06-10 08:10:27 +0300 |
| commit | 8dd9d1cadcedb9e441fe5dc4c3249eaf274caec6 (patch) | |
| tree | 073c8fe52b7e061b933366f89e62cdd751c94419 /test | |
| parent | 02599283d4a13ab943f86d647514c16c4522f378 (diff) | |
Use gitlab stub in config_test.go
Diffstat (limited to 'test')
| -rw-r--r-- | test/acceptance/config_test.go | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/test/acceptance/config_test.go b/test/acceptance/config_test.go index 93e9aa22..5db00696 100644 --- a/test/acceptance/config_test.go +++ b/test/acceptance/config_test.go @@ -4,7 +4,6 @@ import ( "fmt" "net" "net/http" - "os" "testing" "github.com/stretchr/testify/require" @@ -12,11 +11,12 @@ import ( func TestEnvironmentVariablesConfig(t *testing.T) { skipUnlessEnabled(t) - os.Setenv("LISTEN_HTTP", net.JoinHostPort(httpListener.Host, httpListener.Port)) - defer func() { os.Unsetenv("LISTEN_HTTP") }() - teardown := RunPagesProcessWithoutWait(t, *pagesBinary, []ListenSpec{}, "") + envVarValue := "LISTEN_HTTP=" + net.JoinHostPort(httpListener.Host, httpListener.Port) + + _, teardown := RunPagesProcessWithStubGitLabServer(t, false, *pagesBinary, []ListenSpec{}, []string{envVarValue}) defer teardown() + require.NoError(t, httpListener.WaitUntilRequestSucceeds(nil)) rsp, err := GetPageFromListener(t, httpListener, "group.gitlab-example.com:", "project/") @@ -28,10 +28,9 @@ func TestEnvironmentVariablesConfig(t *testing.T) { func TestMixedConfigSources(t *testing.T) { skipUnlessEnabled(t) - os.Setenv("LISTEN_HTTP", net.JoinHostPort(httpListener.Host, httpListener.Port)) - defer func() { os.Unsetenv("LISTEN_HTTP") }() + envVarValue := "LISTEN_HTTP=" + net.JoinHostPort(httpListener.Host, httpListener.Port) - teardown := RunPagesProcessWithoutWait(t, *pagesBinary, []ListenSpec{httpsListener}, "") + _, teardown := RunPagesProcessWithStubGitLabServer(t, false, *pagesBinary, []ListenSpec{httpsListener}, []string{envVarValue}) defer teardown() for _, listener := range []ListenSpec{httpListener, httpsListener} { @@ -44,15 +43,13 @@ func TestMixedConfigSources(t *testing.T) { } } -func TestMultiFlagEnvironmentVariables(t *testing.T) { +func TestMultipleListenersFromEnvironmentVariables(t *testing.T) { skipUnlessEnabled(t) - listenSpecs := []ListenSpec{{"http", "127.0.0.1", "37001"}, {"http", "127.0.0.1", "37002"}} - envVarValue := fmt.Sprintf("%s,%s", net.JoinHostPort("127.0.0.1", "37001"), net.JoinHostPort("127.0.0.1", "37002")) - os.Setenv("LISTEN_HTTP", envVarValue) - defer func() { os.Unsetenv("LISTEN_HTTP") }() + listenSpecs := []ListenSpec{{"http", "127.0.0.1", "37001"}, {"http", "127.0.0.1", "37002"}} + envVarValue := fmt.Sprintf("LISTEN_HTTP=%s,%s", net.JoinHostPort("127.0.0.1", "37001"), net.JoinHostPort("127.0.0.1", "37002")) - teardown := RunPagesProcess(t, *pagesBinary, []ListenSpec{}, "") + _, teardown := RunPagesProcessWithStubGitLabServer(t, false, *pagesBinary, []ListenSpec{}, []string{envVarValue}) defer teardown() for _, listener := range listenSpecs { |