Skip to content

Commit 38f66c9

Browse files
Fix mgt-only tests
1 parent 7d58f70 commit 38f66c9

File tree

8 files changed

+17
-113
lines changed

8 files changed

+17
-113
lines changed

selenium/bin/components/rabbitmq

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,5 +195,6 @@ start_docker_rabbitmq() {
195195
${RABBITMQ_DOCKER_IMAGE}
196196

197197
wait_for_message rabbitmq "Server startup complete"
198+
docker exec -it rabbitmq cat /etc/rabbitmq/enabled_plugins
198199
end "RabbitMQ ready"
199200
}

selenium/suites/mgt/mgt-only-exchanges.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44

55
TEST_CASES_PATH=/exchanges
6-
TEST_CONFIG_PATH=/mgt-only
6+
TEST_CONFIG_PATH=/basic-auth
7+
PROFILES="disable-metrics"
78

89
source $SCRIPT/../../bin/suite_template $@
910
run
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export DISABLE_METRICS=true

selenium/test/exchanges/management.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const OverviewPage = require('../pageobjects/OverviewPage')
88
const ExchangesPage = require('../pageobjects/ExchangesPage')
99
const ExchangePage = require('../pageobjects/ExchangePage')
1010

11+
const DISABLE_METRICS = process.env.DISABLE_METRICS || false
12+
1113
describe('Exchange management', function () {
1214
let login
1315
let exchanges
@@ -76,7 +78,6 @@ describe('Exchange management', function () {
7678
await exchanges.clickOnSelectTableColumns()
7779
let table = await exchanges.getSelectableTableColumns()
7880

79-
assert.equal(2, table.length)
8081
let overviewGroup = {
8182
"name" : "Overview:",
8283
"columns": [
@@ -88,14 +89,18 @@ describe('Exchange management', function () {
8889
}
8990
assert.equal(JSON.stringify(table[0]), JSON.stringify(overviewGroup))
9091

91-
let messageRatesGroup = {
92-
"name" : "Message rates:",
93-
"columns": [
94-
{"name:":"rate in","id":"checkbox-exchanges-rate-in"},
95-
{"name:":"rate out","id":"checkbox-exchanges-rate-out"}
96-
]
92+
if (!DISABLE_METRICS) {
93+
assert.equal(table.length, 2)
94+
95+
let messageRatesGroup = {
96+
"name" : "Message rates:",
97+
"columns": [
98+
{"name:":"rate in","id":"checkbox-exchanges-rate-in"},
99+
{"name:":"rate out","id":"checkbox-exchanges-rate-out"}
100+
]
101+
}
102+
assert.equal(JSON.stringify(table[1]), JSON.stringify(messageRatesGroup))
97103
}
98-
assert.equal(JSON.stringify(table[1]), JSON.stringify(messageRatesGroup))
99104

100105
})
101106

selenium/test/mgt-only/enabled_plugins

Lines changed: 0 additions & 15 deletions
This file was deleted.

selenium/test/mgt-only/imports/users.json

Lines changed: 0 additions & 81 deletions
This file was deleted.

selenium/test/mgt-only/logging.conf

Lines changed: 0 additions & 1 deletion
This file was deleted.

selenium/test/mgt-only/rabbitmq.conf

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)