Merge branch 'fix/domainresolver-test-race' into 'master'

test: fix Flaky TestDomainResolverError race

Closes #787

See merge request gitlab-org/gitlab-pages!806

1 files changed, 7 insertions, 3 deletions

diff --git a/test/acceptance/serving_test.go b/test/acceptance/serving_test.go
index 1655389b..410e5ca0 100644
--- a/test/acceptance/serving_test.go
+++ b/test/acceptance/serving_test.go
@@ -379,7 +379,7 @@ func TestDomainResolverError(t *testing.T) {
 
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			called := false
+			called := make(chan struct{})
 
 			// handler setup
 			pagesHandler := func(w http.ResponseWriter, r *http.Request) {
@@ -388,7 +388,7 @@ func TestDomainResolverError(t *testing.T) {
 					return
 				}
 
-				called = true
+				close(called)
 
 				if test.panic {
 					panic("server failed")
@@ -414,7 +414,11 @@ func TestDomainResolverError(t *testing.T) {
 			require.NoError(t, err)
 			testhelpers.Close(t, response.Body)
 
-			require.True(t, called, "api must have been called")
+			select {
+			case <-called:
+			case <-time.After(2 * time.Second):
+				t.Fatal("timed out waiting for the pages handler")
+			}
 
 			require.Equal(t, http.StatusBadGateway, response.StatusCode)