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>2021-04-22 17:07:37 +0300
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2021-04-22 17:07:37 +0300
commita8891954aa11de29da14a847b2d59b37e3291476 (patch)
tree11e79ea8fa95f5693d52918c8e15ceb8f1122132
parentc6e65ff37ac95213ac5abfc9959d5ae43e98e1f5 (diff)
Fix helper tests using the wrong listeners
-rw-r--r--test/acceptance/helpers_test.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/acceptance/helpers_test.go b/test/acceptance/helpers_test.go
index cc27299e..8bfd81bc 100644
--- a/test/acceptance/helpers_test.go
+++ b/test/acceptance/helpers_test.go
@@ -327,7 +327,7 @@ func runPagesProcess(t *testing.T, wait bool, pagesBinary string, listeners []Li
}
if wait {
- for _, spec := range SupportedListeners() {
+ for _, spec := range listeners {
if err := spec.WaitUntilRequestSucceeds(waitCh); err != nil {
cleanup()
t.Fatal(err)
@@ -343,7 +343,7 @@ func getPagesArgs(t *testing.T, listeners []ListenSpec, promPort string, extraAr
args = append(args, "-log-verbose=true")
- for _, spec := range SupportedListeners() {
+ for _, spec := range listeners {
args = append(args, "-listen-"+spec.Type, spec.JoinHostPort())
if spec.Type == request.SchemeHTTPS {
@@ -527,7 +527,7 @@ func ClientWithConfig(tlsConfig *tls.Config) (*http.Client, func()) {
func waitForRoundtrips(t *testing.T, listeners []ListenSpec, timeout time.Duration) {
nListening := 0
start := time.Now()
- for _, spec := range SupportedListeners() {
+ for _, spec := range listeners {
for time.Since(start) < timeout {
req, err := http.NewRequest("GET", spec.URL("/"), nil)
if err != nil {