Fixed intermittent login reset due to cluster service restart

test/acceptance/test/acceptance_suite_test.go

@@ -64,7 +64,8 @@ var _ = BeforeSuite(func() {
 var _ = AfterSuite(func() {
 	//Tear down the suite level setup
 	By(fmt.Sprintf("Logout as a %s user", userCredentials.UserType), func() {
-		logoutUser() // Logout to the weaveworks enterprise
+		Expect(webDriver.Navigate(test_ui_url)).To(Succeed()) // Make sure the UI should not has any popups and modal dialogs
+		logoutUser()                                          // Logout to the weaveworks enterprise
 	})
 
 	deleteRepo(gitProviderEnv) // Delete the config repository to keep the org clean

test/acceptance/test/ui_clusters.go

@@ -271,6 +271,10 @@ func DescribeClusters(gitopsTestRunner GitopsTestRunner) {
 				Eventually(webDriver.Refresh).ShouldNot(HaveOccurred())
 			})
 
+			By(fmt.Sprintf("Login again as a %s user after eterprise state reset", userCredentials.UserType), func() {
+				loginUser()
+			})
+
 			clustersPage := pages.GetClustersPage(webDriver)
 			By("Then I should see the correct clusters count next to the clusters header", func() {
 				Eventually(clustersPage.ClusterCount).Should(MatchText(`[0-9]+`))
@@ -428,9 +432,15 @@ func DescribeClusters(gitopsTestRunner GitopsTestRunner) {
 
 			Skip("Alertmanager is not accessible via ingress anymore!")
 
-			gitopsTestRunner.ResetControllers("enterprise")
-			gitopsTestRunner.VerifyWegoPodsRunning()
-			Eventually(webDriver.Refresh).ShouldNot(HaveOccurred())
+			By("And wego enterprise state is reset", func() {
+				gitopsTestRunner.ResetControllers("enterprise")
+				gitopsTestRunner.VerifyWegoPodsRunning()
+				Eventually(webDriver.Refresh).ShouldNot(HaveOccurred())
+			})
+
+			By(fmt.Sprintf("Login again as a %s user after eterprise state reset", userCredentials.UserType), func() {
+				loginUser()
+			})
 
 			clustersPage := pages.GetClustersPage(webDriver)
 			pages.NavigateToPage(webDriver, "Alerts")
@@ -543,9 +553,15 @@ func DescribeClusters(gitopsTestRunner GitopsTestRunner) {
 
 			Skip("Alertmanager is not accessible via ingress anymore!")
 
-			gitopsTestRunner.ResetControllers("enterprise")
-			gitopsTestRunner.VerifyWegoPodsRunning()
-			Eventually(webDriver.Refresh).ShouldNot(HaveOccurred())
+			By("And wego enterprise state is reset", func() {
+				gitopsTestRunner.ResetControllers("enterprise")
+				gitopsTestRunner.VerifyWegoPodsRunning()
+				Eventually(webDriver.Refresh).ShouldNot(HaveOccurred())
+			})
+
+			By(fmt.Sprintf("Login again as a %s user after eterprise state reset", userCredentials.UserType), func() {
+				loginUser()
+			})
 
 			clustersPage := pages.GetClustersPage(webDriver)
 

test/acceptance/test/ui_templates.go

@@ -1221,6 +1221,8 @@ func DescribeTemplates(gitopsTestRunner GitopsTestRunner) {
 				}
 
 				Expect(webDriver.Refresh()).ShouldNot(HaveOccurred())
+				loginUser()
+
 				if beFound {
 					Eventually(checkOutput, ASSERTION_2MINUTE_TIME_OUT).Should(BeTrue())
 				} else {

test/acceptance/test/utils_gitops.go

@@ -286,7 +286,6 @@ func verifyCapiClusterHealth(kubeconfigPath string, capiCluster string, profiles
 		case "observability":
 			Expect(waitForResource("deploy", capiCluster+"-observability-grafana", namespace, kubeconfigPath, ASSERTION_2MINUTE_TIME_OUT))
 			Expect(waitForResource("deploy", capiCluster+"-observability-kube-state-metrics", namespace, kubeconfigPath, ASSERTION_2MINUTE_TIME_OUT))
-			Expect(waitForResource("deploy", capiCluster+"-operator", namespace, kubeconfigPath, ASSERTION_2MINUTE_TIME_OUT))
 			waitForResourceState("Ready", "true", "pods", namespace, "release="+capiCluster+"-observability", kubeconfigPath, ASSERTION_3MINUTE_TIME_OUT)
 		case "podinfo":
 			Expect(waitForResource("deploy", capiCluster+"-podinfo ", namespace, kubeconfigPath, ASSERTION_2MINUTE_TIME_OUT))

test/acceptance/test/utils_login.go

@@ -37,71 +37,76 @@ func initUserCredentials() UserCredentials {
 
 func loginUser() {
 	loginPage := pages.GetLoginPage(webDriver)
-	Eventually(loginPage.LoginOIDC).Should(BeVisible())
-
-	switch userCredentials.UserType {
-	case ClusterUserLogin:
-		// Login via cluster user account
-		Expect(loginPage.Password.SendKeys(userCredentials.UserPassword)).To(Succeed())
-		Expect(loginPage.Continue.Click()).To(Succeed())
-	case OidcUserLogin:
-		// Login via OIDC provider
-		Eventually(loginPage.LoginOIDC.Click).Should(Succeed())
-
-		dexLogin := pages.GetDexLoginPage(webDriver)
-		switch gitProviderEnv.Type {
-		case GitProviderGitHub:
-			Eventually(dexLogin.Github.Click).Should(Succeed())
-
-			authenticate := pages.ActivateDeviceGithub(webDriver)
-
-			if pages.ElementExist(authenticate.Username) {
-				Eventually(authenticate.Username).Should(BeVisible())
-				Expect(authenticate.Username.SendKeys(userCredentials.UserName)).To(Succeed())
-				Expect(authenticate.Password.SendKeys(userCredentials.UserPassword)).To(Succeed())
-				Expect(authenticate.Signin.Click()).To(Succeed())
-			}
-
-			if pages.ElementExist(authenticate.AuthCode) {
-				Eventually(authenticate.AuthCode).Should(BeVisible())
-				// Generate 6 digit authentication OTP for MFA
-				authCode, _ := runCommandAndReturnStringOutput("totp-cli instant")
-				Expect(authenticate.AuthCode.SendKeys(authCode)).To(Succeed())
-			}
-			Eventually(dexLogin.GrantAccess.Click).Should(Succeed())
 
-		case GitProviderGitLab:
-			Eventually(dexLogin.GitlabOnPrem.Click).Should(Succeed())
-
-			var authenticate *pages.AuthenticateGitlab
-			if gitProviderEnv.Hostname == gitlab.DefaultDomain {
-				authenticate = pages.AuthenticateWithGitlab(webDriver)
-			} else {
-				authenticate = pages.AuthenticateWithOnPremGitlab(webDriver)
-			}
-			if pages.ElementExist(authenticate.Username) {
-				Eventually(authenticate.Username).Should(BeVisible())
-				Expect(authenticate.Username.SendKeys(userCredentials.UserName)).To(Succeed())
-				Expect(authenticate.Password.SendKeys(userCredentials.UserPassword)).To(Succeed())
-				Expect(authenticate.Signin.Click()).To(Succeed())
+	if pages.ElementExist(loginPage.LoginOIDC, 10) {
+		Eventually(loginPage.LoginOIDC).Should(BeVisible())
+
+		switch userCredentials.UserType {
+		case ClusterUserLogin:
+			// Login via cluster user account
+			Expect(loginPage.Password.SendKeys(userCredentials.UserPassword)).To(Succeed())
+			Expect(loginPage.Continue.Click()).To(Succeed())
+		case OidcUserLogin:
+			// Login via OIDC provider
+			Eventually(loginPage.LoginOIDC.Click).Should(Succeed())
+
+			dexLogin := pages.GetDexLoginPage(webDriver)
+			switch gitProviderEnv.Type {
+			case GitProviderGitHub:
+				Eventually(dexLogin.Github.Click).Should(Succeed())
+
+				authenticate := pages.ActivateDeviceGithub(webDriver)
+
+				if pages.ElementExist(authenticate.Username) {
+					Eventually(authenticate.Username).Should(BeVisible())
+					Expect(authenticate.Username.SendKeys(userCredentials.UserName)).To(Succeed())
+					Expect(authenticate.Password.SendKeys(userCredentials.UserPassword)).To(Succeed())
+					Expect(authenticate.Signin.Click()).To(Succeed())
+				}
+
+				if pages.ElementExist(authenticate.AuthCode) {
+					Eventually(authenticate.AuthCode).Should(BeVisible())
+					// Generate 6 digit authentication OTP for MFA
+					authCode, _ := runCommandAndReturnStringOutput("totp-cli instant")
+					Expect(authenticate.AuthCode.SendKeys(authCode)).To(Succeed())
+				}
+				Eventually(dexLogin.GrantAccess.Click).Should(Succeed())
+
+			case GitProviderGitLab:
+				Eventually(dexLogin.GitlabOnPrem.Click).Should(Succeed())
+
+				var authenticate *pages.AuthenticateGitlab
+				if gitProviderEnv.Hostname == gitlab.DefaultDomain {
+					authenticate = pages.AuthenticateWithGitlab(webDriver)
+				} else {
+					authenticate = pages.AuthenticateWithOnPremGitlab(webDriver)
+				}
+				if pages.ElementExist(authenticate.Username) {
+					Eventually(authenticate.Username).Should(BeVisible())
+					Expect(authenticate.Username.SendKeys(userCredentials.UserName)).To(Succeed())
+					Expect(authenticate.Password.SendKeys(userCredentials.UserPassword)).To(Succeed())
+					Expect(authenticate.Signin.Click()).To(Succeed())
+				}
+				Eventually(dexLogin.GrantAccess.Click).Should(Succeed())
+			default:
+				Expect(fmt.Errorf("error: Provided oidc issuer '%s' is not supported", gitProviderEnv.Type))
 			}
-			Eventually(dexLogin.GrantAccess.Click).Should(Succeed())
 		default:
-			Expect(fmt.Errorf("error: Provided oidc issuer '%s' is not supported", gitProviderEnv.Type))
+			Expect(fmt.Errorf("error: Provided login type '%s' is not supported", userCredentials.UserType))
 		}
-	default:
-		Expect(fmt.Errorf("error: Provided login type '%s' is not supported", userCredentials.UserType))
-	}
 
-	Eventually(loginPage.AccountSettings.Click).Should(Succeed())
-	account := pages.GetAccount(webDriver)
-	Eventually(account.User.Click).Should(Succeed())
+		Eventually(loginPage.AccountSettings.Click).Should(Succeed())
+		account := pages.GetAccount(webDriver)
+		Eventually(account.User.Click).Should(Succeed())
+	} else {
+		logger.Infof("%s user already logged in", userCredentials.UserType)
+	}
 }
 
 func logoutUser() {
 	loginPage := pages.GetLoginPage(webDriver)
 
-	if pages.ElementExist(loginPage.AccountSettings) {
+	if pages.ElementExist(loginPage.AccountSettings, 10) {
 		Eventually(loginPage.AccountSettings.Click).Should(Succeed())
 		account := pages.GetAccount(webDriver)
 		Eventually(account.Logout.Click).Should(Succeed())