From 6f1ec2094d64f2c60c18fb0d4d6785dcb60f3061 Mon Sep 17 00:00:00 2001
From: Clement Michaud <clement.michaud34@gmail.com>
Date: Sun, 8 Dec 2019 13:16:13 +0100
Subject: [PATCH] Fix HighAvailability suite randomness.

---
 .../suites/suite_high_availability_test.go    | 24 ++++---------------
 internal/suites/verify_url_is.go              |  4 ++--
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/internal/suites/suite_high_availability_test.go b/internal/suites/suite_high_availability_test.go
index 478dc9a6..ab1b979c 100644
--- a/internal/suites/suite_high_availability_test.go
+++ b/internal/suites/suite_high_availability_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	"strings"
 	"testing"
 	"time"
 
@@ -64,30 +63,17 @@ func (s *HighAvailabilityWebDriverSuite) TestShouldKeepUserDataInDB() {
 }
 
 func (s *HighAvailabilityWebDriverSuite) TestShouldKeepSessionAfterAutheliaRestart() {
-	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
 	defer cancel()
 
 	secret := s.doRegisterAndLogin2FA(ctx, s.T(), "john", "password", false, "")
+	s.verifyIsSecondFactorPage(ctx, s.T())
 
 	err := haDockerEnvironment.Restart("authelia-backend")
-	s.Assert().NoError(err)
+	s.Require().NoError(err)
 
-	loop := true
-	for loop {
-		logs, err := haDockerEnvironment.Logs("authelia-backend", []string{"--tail", "10"})
-		s.Assert().NoError(err)
-
-		select {
-		case <-time.After(1 * time.Second):
-			if strings.Contains(logs, "Authelia is listening on :9091") {
-				loop = false
-			}
-			break
-		case <-ctx.Done():
-			loop = false
-			break
-		}
-	}
+	err = waitUntilAutheliaBackendIsReady(haDockerEnvironment)
+	s.Require().NoError(err)
 
 	s.doVisit(s.T(), HomeBaseURL)
 	s.verifyIsHome(ctx, s.T())
diff --git a/internal/suites/verify_url_is.go b/internal/suites/verify_url_is.go
index b90236de..009ef656 100644
--- a/internal/suites/verify_url_is.go
+++ b/internal/suites/verify_url_is.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"github.com/tebeka/selenium"
 )
 
@@ -18,5 +18,5 @@ func (wds *WebDriverSession) verifyURLIs(ctx context.Context, t *testing.T, url
 		return currentURL == url, nil
 	})
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 }