Skip to content

Commit 0db8dfc

Browse files
Use /var to store suite files
This is because docker desktop allowed the use of /tmp but with Rancher it is not possible
1 parent 7b1691d commit 0db8dfc

File tree

7 files changed

+17
-14
lines changed

7 files changed

+17
-14
lines changed

selenium/bin/suite_template

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ SELENIUM_ROOT_FOLDER=$(find_selenium_dir $SCRIPT)
3131
TEST_DIR=$SELENIUM_ROOT_FOLDER/test
3232
BIN_DIR=$SELENIUM_ROOT_FOLDER/bin
3333
SCREENS=${SELENIUM_ROOT_FOLDER}/screens/${SUITE}
34-
CONF_DIR=${CONF_DIR_PREFIX:-/tmp}/selenium/${SUITE}
34+
CONF_DIR_PREFIX=$(mktemp -d)
35+
CONF_DIR=${CONF_DIR_PREFIX}/selenium/${SUITE}
3536
LOGS=${CONF_DIR}/logs
3637
ENV_FILE=$CONF_DIR/.env
3738
OTHER_ENV_FILE=$CONF_DIR/.other.env
@@ -116,6 +117,7 @@ init_suite() {
116117

117118
begin "Initializing suite $SUITE ..."
118119
print "> REQUIRED_COMPONENTS: ${REQUIRED_COMPONENTS[*]}"
120+
print "> CONF_DIR: ${CONF_DIR} "
119121
print "> TEST_CASES_DIR: ${TEST_CASES_DIR} "
120122
print "> TEST_CONFIG_DIR: ${TEST_CONFIG_DIR} "
121123
print "> DOCKER_NETWORK: ${DOCKER_NETWORK} "

selenium/run-suites.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ while read SUITE
1717
do
1818
echo -e "=== Running suite (${TOTAL_SUITES}/${GREEN}${#SUCCESSFUL_SUITES[@]}/${RED}${#FAILED_SUITES[@]}${NC}) $SUITE ============================================"
1919
echo " "
20+
2021
ENV_MODES="docker" $SCRIPT/suites/$SUITE
2122
TEST_RESULT="$?"
2223
TEST_STATUS="${GREEN}Succeeded${NC}"

selenium/test/connections/amqp10/sessions-for-monitoring-user.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const { By, Key, until, Builder } = require('selenium-webdriver')
22
require('chromedriver')
33
const assert = require('assert')
44
const { open: openAmqp, once: onceAmqp, on: onAmqp, close: closeAmqp } = require('../../amqp')
5-
const { buildDriver, goToHome, captureScreensFor, teardown, delay, doWhile } = require('../../utils')
5+
const { buildDriver, goToHome, captureScreensFor, teardown, delay, doUntil } = require('../../utils')
66

77
const LoginPage = require('../../pageobjects/LoginPage')
88
const OverviewPage = require('../../pageobjects/OverviewPage')
@@ -98,7 +98,7 @@ describe('Given an amqp10 connection opened, listed and clicked on it', function
9898
assert.equal(2, receivedAmqpMessageCount)
9999

100100
await delay(5*1000) // wait until page refreshes
101-
let sessions = await doWhile(function() { return connectionPage.getSessions() },
101+
let sessions = await doUntil(function() { return connectionPage.getSessions() },
102102
function(obj) { return obj != undefined })
103103
let incomingLink = connectionPage.getIncomingLinkInfo(sessions.incoming_links, 0)
104104
assert.equal(2, incomingLink.deliveryCount)

selenium/test/exchanges/management.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { By, Key, until, Builder } = require('selenium-webdriver')
22
require('chromedriver')
33
const assert = require('assert')
4-
const { buildDriver, goToHome, captureScreensFor, teardown, doWhile, log } = require('../utils')
4+
const { buildDriver, goToHome, captureScreensFor, teardown, doUntil, log } = require('../utils')
55

66
const LoginPage = require('../pageobjects/LoginPage')
77
const OverviewPage = require('../pageobjects/OverviewPage')
@@ -70,7 +70,7 @@ describe('Exchange management', function () {
7070
it('exchange selectable columns', async function () {
7171
await overview.clickOnOverviewTab()
7272
await overview.clickOnExchangesTab()
73-
await doWhile(async function() { return exchanges.getExchangesTable() },
73+
await doUntil(async function() { return exchanges.getExchangesTable() },
7474
function(table) {
7575
return table.length > 0
7676
})

selenium/test/queuesAndStreams/list.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { By, Key, until, Builder } = require('selenium-webdriver')
22
require('chromedriver')
33
const assert = require('assert')
4-
const { buildDriver, goToHome, captureScreensFor, teardown, doWhile } = require('../utils')
4+
const { buildDriver, goToHome, captureScreensFor, teardown, doUntil } = require('../utils')
55

66
const LoginPage = require('../pageobjects/LoginPage')
77
const OverviewPage = require('../pageobjects/OverviewPage')
@@ -48,7 +48,7 @@ describe('Queues and Streams management', function () {
4848
let queueName = "test_" + Math.floor(Math.random() * 1000)
4949
await queuesAndStreams.fillInAddNewQueue({"name" : queueName, "type" : "classic"})
5050

51-
await doWhile(async function() { return queuesAndStreams.getQueuesTable() },
51+
await doUntil(async function() { return queuesAndStreams.getQueuesTable() },
5252
function(table) {
5353
return table.length > 0
5454
})

selenium/test/utils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ module.exports = {
144144
return new CaptureScreenshot(d.driver, require('path').basename(test))
145145
},
146146

147-
doWhile: async (doCallback, booleanCallback, delayMs = 1000, message = "doWhile failed") => {
147+
doUntil: async (doCallback, booleanCallback, delayMs = 1000, message = "doUntil failed") => {
148148
let done = false
149149
let attempts = 10
150150
let ret
@@ -156,7 +156,7 @@ module.exports = {
156156
+ ") with arg " + JSON.stringify(ret) + " ... ")
157157
done = booleanCallback(ret)
158158
}catch(error) {
159-
module.exports.error("Caught " + error + " on doWhile callback...")
159+
module.exports.error("Caught " + error + " on doUntil callback...")
160160

161161
}finally {
162162
if (!done) {
@@ -184,7 +184,7 @@ module.exports = {
184184
+ ") with arg " + JSON.stringify(ret) + " ... ")
185185
done = booleanCallback(ret)
186186
}catch(error) {
187-
module.exports.error("Caught " + error + " on doWhile callback...")
187+
module.exports.error("Caught " + error + " on retry callback...")
188188

189189
}finally {
190190
if (!done) {

selenium/test/vhosts/admin-vhosts.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { By, Key, until, Builder } = require('selenium-webdriver')
22
require('chromedriver')
33
const assert = require('assert')
4-
const { buildDriver, goToHome, captureScreensFor, teardown, doWhile, log, delay } = require('../utils')
4+
const { buildDriver, goToHome, captureScreensFor, teardown, doUntil, log, delay } = require('../utils')
55
const { getManagementUrl, createVhost, deleteVhost } = require('../mgt-api')
66

77
const LoginPage = require('../pageobjects/LoginPage')
@@ -56,7 +56,7 @@ describe('Virtual Hosts in Admin tab', function () {
5656
await adminTab.clickOnVhosts()
5757
await vhostsTab.isLoaded()
5858
await vhostsTab.searchForVhosts("/")
59-
await doWhile(async function() { return vhostsTab.getVhostsTable() },
59+
await doUntil(async function() { return vhostsTab.getVhostsTable() },
6060
function(table) {
6161
return table.length>0
6262
})
@@ -115,15 +115,15 @@ describe('Virtual Hosts in Admin tab', function () {
115115
it('vhost is listed with tag', async function () {
116116
log("Searching for vhost " + vhost)
117117
await vhostsTab.searchForVhosts(vhost)
118-
await doWhile(async function() { return vhostsTab.getVhostsTable()},
118+
await doUntil(async function() { return vhostsTab.getVhostsTable()},
119119
function(table) {
120120
log("table: "+ JSON.stringify(table) + " table[0][0]:" + table[0][0])
121121
return table.length==1 && table[0][0].localeCompare(vhost) == 0
122122
})
123123
log("Found vhost " + vhost)
124124
await vhostsTab.selectTableColumnsById(["checkbox-vhosts-tags"])
125125

126-
await doWhile(async function() { return vhostsTab.getVhostsTable() },
126+
await doUntil(async function() { return vhostsTab.getVhostsTable() },
127127
function(table) {
128128
return table.length==1 && table[0][3].localeCompare("selenium-tag") == 0
129129
})

0 commit comments

Comments
 (0)