Merge pull request #13249 from rabbitmq/mergify/bp/v4.0.x/pr-13246

Fix flake on rabbitmq_mqtt auth_SUITE (backport #13180) (backport #13246)

Author: michaelklishin

deps/rabbitmq_mqtt/test/auth_SUITE.erl

@@ -68,9 +68,11 @@ sub_groups() ->
        ssl_user_vhost_parameter_mapping_vhost_does_not_exist,
        ssl_user_cert_vhost_mapping_takes_precedence_over_port_vhost_mapping
       ]},
-     {ssl_user_with_client_id_in_cert_san_dns, [], 
-       [client_id_from_cert_san_dns,
-        invalid_client_id_from_cert_san_dns
+     {ssl_user_with_invalid_client_id_in_cert_san_dns, [],
+       [invalid_client_id_from_cert_san_dns
+       ]},
+     {ssl_user_with_client_id_in_cert_san_dns, [],
+       [client_id_from_cert_san_dns        
        ]},
      {ssl_user_with_client_id_in_cert_san_dns_1, [], 
        [client_id_from_cert_san_dns_1        
@@ -207,7 +209,8 @@ mqtt_config(no_ssl_user) ->
 mqtt_config(client_id_propagation) ->
     {rabbitmq_mqtt, [{ssl_cert_login,  true},
                      {allow_anonymous, true}]};
-mqtt_config(ssl_user_with_client_id_in_cert_san_dns) ->
+mqtt_config(T) when T == ssl_user_with_client_id_in_cert_san_dns;
+                    T == ssl_user_with_invalid_client_id_in_cert_san_dns ->
     {rabbitmq_mqtt, [{ssl_cert_login,  true},
                      {allow_anonymous, false}, 
                      {ssl_cert_client_id_from, subject_alternative_name},
@@ -588,8 +591,8 @@ client_id_from_cert_dn(Config) ->
 invalid_client_id_from_cert_san_dns(Config) ->    
     MqttClientId = <<"other_client_id">>,
     {ok, C} = connect_ssl(MqttClientId, Config),
-    ?assertMatch({error, _}, emqtt:connect(C)),
-    unlink(C).
+    unlink(C),
+    {error, {client_identifier_not_valid, _}} = emqtt:connect(C).        
 
 ssl_user_vhost_parameter_mapping_success(Config) ->
     expect_successful_connection(fun connect_ssl/1, Config).

selenium/package.json

@@ -12,7 +12,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^128.0.0",
+    "chromedriver": "^132.0",
     "ejs": "^3.1.8",
     "express": "^4.18.2",
     "geckodriver": "^3.0.2",

selenium/test/pageobjects/BasePage.js

@@ -45,6 +45,7 @@ module.exports = class BasePage {
     return this.selectOption(SELECT_REFRESH, option)
   }
   async waitForOverviewTab() {
+    await this.driver.sleep(250)
     return this.waitForDisplayed(OVERVIEW_TAB)
   }
 
@@ -56,27 +57,31 @@ module.exports = class BasePage {
     return this.click(CONNECTIONS_TAB)
   }
   async waitForConnectionsTab() {
+    await this.driver.sleep(250)
     return this.waitForDisplayed(CONNECTIONS_TAB)
   }
 
   async clickOnAdminTab () {
     return this.click(ADMIN_TAB)
   }
   async waitForAdminTab() {
+    await this.driver.sleep(250)
     return this.waitForDisplayed(ADMIN_TAB)
   }
 
   async clickOnChannelsTab () {
     return this.click(CHANNELS_TAB)
   }
   async waitForChannelsTab() {
+    await this.driver.sleep(250)
     return this.waitForDisplayed(CHANNELS_TAB)
   }
 
   async clickOnExchangesTab () {
     return this.click(EXCHANGES_TAB)
   }
   async waitForExchangesTab() {
+    await this.driver.sleep(250)
     return this.waitForDisplayed(EXCHANGES_TAB)
   }
 
@@ -179,42 +184,69 @@ module.exports = class BasePage {
   }
 
   async waitForLocated (locator) {
-    try {
-      return this.driver.wait(until.elementLocated(locator), this.timeout,
-        'Timed out after [timeout=' + this.timeout + ';polling=' + this.polling + '] seconds locating ' + locator,
-        this.polling)
-    }catch(error) {
-      if (!error.name.includes("NoSuchSessionError")) {
-        console.error("Failed waitForLocated " + locator + " due to " + error)
-      }
-      throw error
-    }
+    let attempts = 3
+    let retry = false
+    let rethrowError = null
+    do {
+      try {
+        return this.driver.wait(until.elementLocated(locator), this.timeout,
+          'Timed out after [timeout=' + this.timeout + ';polling=' + this.polling + '] seconds locating ' + locator,
+          this.polling)
+      }catch(error) {
+        if (error.name.includes("StaleElementReferenceError")) {
+          retry = true
+        }else if (!error.name.includes("NoSuchSessionError")) {
+          console.error("Failed waitForLocated " + locator + " due to " + error)
+          retry = false
+        }
+        rethrowError = error
+      }  
+    } while (retry && --attempts > 0)
+    throw rethrowError
   }
 
   async waitForVisible (element) {
-    try {
-      return this.driver.wait(until.elementIsVisible(element), this.timeout,
-        'Timed out after [timeout=' + this.timeout + ';polling=' + this.polling + '] awaiting till visible ' + element,
-        this.polling)
-    }catch(error) {      
-      if (!error.name.includes("NoSuchSessionError")) {
-        console.error("Failed to find visible element " + element + " due to " + error)
+    let attempts = 3
+    let retry = false
+    let rethrowError = null
+    do {      
+      try {
+        return this.driver.wait(until.elementIsVisible(element), this.timeout,
+          'Timed out after [timeout=' + this.timeout + ';polling=' + this.polling + '] awaiting till visible ' + element,
+          this.polling)
+      }catch(error) {         
+        if (error.name.includes("StaleElementReferenceError")) {
+          retry = true
+        }else if (!error.name.includes("NoSuchSessionError")) {
+          console.error("Failed to find visible element " + element + " due to " + error)
+          retry = false
+        }        
+        rethrowError = error
       }
-      throw error
-    }
+    } while (retry && --attempts > 0)
+    throw rethrowError
   }
 
 
   async waitForDisplayed (locator) {
-    if (this.interactionDelay && this.interactionDelay > 0) await this.driver.sleep(this.interactionDelay)
-    try {
-      return this.waitForVisible(await this.waitForLocated(locator))
-    }catch(error) {
-      if (!error.name.includes("NoSuchSessionError")) {
-        console.error("Failed to waitForDisplayed " + locator + " due to " + error)
-      }
-      throw error
-    }
+    let attempts = 3
+    let retry = false
+    let rethrowError = null
+    do {
+      if (this.interactionDelay && this.interactionDelay > 0) await this.driver.sleep(this.interactionDelay)
+        try {
+          return this.waitForVisible(await this.waitForLocated(locator))
+        }catch(error) {
+          if (error.name.includes("StaleElementReferenceError")) {
+            retry = true
+          }else if (!error.name.includes("NoSuchSessionError")) {
+            retry = false
+            console.error("Failed to waitForDisplayed " + locator + " due to " + error)
+          }
+          rethrowError = error
+        }
+    } while (retry && --attempts > 0 )
+    throw rethrowError
   }
 
   async getText (locator) {