From 6578c83a0e9abcc70bc9d07bcfdbce4cab78e0c8 Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Wed, 21 May 2025 14:10:30 +0200 Subject: [PATCH 1/3] Bump up chrome driver This is needed when running tests interactively. The OS updates the local chrome binary and this node.js library has to be upgraded too. --- selenium/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selenium/package.json b/selenium/package.json index 6034033702c8..f8f1402b6ce7 100644 --- a/selenium/package.json +++ b/selenium/package.json @@ -12,7 +12,7 @@ "author": "", "license": "ISC", "dependencies": { - "chromedriver": "^134.0", + "chromedriver": "^135.0", "ejs": "^3.1.8", "express": "^4.18.2", "geckodriver": "^3.0.2", From 44dd282ed4e6d8378af23127dead606b356499a0 Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Wed, 21 May 2025 15:15:35 +0200 Subject: [PATCH 2/3] Eliminate flake around listing live amqp connections --- .../test/connections/amqp10/sessions-for-monitoring-user.js | 5 +++-- selenium/test/pageobjects/ConnectionPage.js | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/selenium/test/connections/amqp10/sessions-for-monitoring-user.js b/selenium/test/connections/amqp10/sessions-for-monitoring-user.js index 083ea88dca3e..0e6c7865437a 100644 --- a/selenium/test/connections/amqp10/sessions-for-monitoring-user.js +++ b/selenium/test/connections/amqp10/sessions-for-monitoring-user.js @@ -2,7 +2,7 @@ const { By, Key, until, Builder } = require('selenium-webdriver') require('chromedriver') const assert = require('assert') const { open: openAmqp, once: onceAmqp, on: onAmqp, close: closeAmqp } = require('../../amqp') -const { buildDriver, goToHome, captureScreensFor, teardown, delay } = require('../../utils') +const { buildDriver, goToHome, captureScreensFor, teardown, delay, doWhile } = require('../../utils') const LoginPage = require('../../pageobjects/LoginPage') const OverviewPage = require('../../pageobjects/OverviewPage') @@ -98,7 +98,8 @@ describe('Given an amqp10 connection opened, listed and clicked on it', function assert.equal(2, receivedAmqpMessageCount) await delay(5*1000) // wait until page refreshes - let sessions = await connectionPage.getSessions() + let sessions = await doWhile(function() { return connectionPage.getSessions() }, + function(obj) { return obj != undefined }) let incomingLink = connectionPage.getIncomingLinkInfo(sessions.incoming_links, 0) assert.equal(2, incomingLink.deliveryCount) diff --git a/selenium/test/pageobjects/ConnectionPage.js b/selenium/test/pageobjects/ConnectionPage.js index 66e396afbc86..05476281f8ad 100644 --- a/selenium/test/pageobjects/ConnectionPage.js +++ b/selenium/test/pageobjects/ConnectionPage.js @@ -3,7 +3,6 @@ const { By, Key, until, Builder } = require('selenium-webdriver') const BasePage = require('./BasePage') -const OVERVIEW_SECTION = By.css('div#main div.section#connection-overview-section') const SESSIONS_SECTION = By.css('div#main div.section#connection-sessions-section') const SESSIONS_TABLE = By.css('div.section#connection-sessions-section table.list#sessions') const INCOMING_LINKS_TABLE = By.css('div.section#connection-sessions-section table.list#incoming-links') From a028db8156ce3b44d1d7da1fbe8f352ea7c1f205 Mon Sep 17 00:00:00 2001 From: Marcial Rosales Date: Wed, 21 May 2025 15:50:29 +0200 Subject: [PATCH 3/3] Briefly explain how to start a second rabbitmq server interactively --- selenium/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/selenium/README.md b/selenium/README.md index 5c72d3f44c0a..6bec54a14fad 100644 --- a/selenium/README.md +++ b/selenium/README.md @@ -168,6 +168,12 @@ suites/authnz-mgt/oauth-with-uaa.sh test happy-login.js been implemented yet. +If your test requires two RabbitMQ servers, typically required when testing WSR or shovels or federation, +you can run the second server, a.k.a. `downstream`, as follows: +``` +suites/.sh start-other-rabbitmq +``` + ## Test case configuration RabbitMQ and other components such as UAA, or Keycloak, require configuration files which varies