External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 18:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4724 from dsesami/flake-fixes

Browse Source 
flake fixes for e2e

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-09-12 17:48:27 +00:00
committed by GitHub
parent ffc6e2218e f2ccce3478
commit 3e6131c509
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/test/e2e/commands/logout.js
View File

@@ -5,6 +5,9 @@
exports.command = function logout () { exports.command = function logout () {
const logoutButton = '.at-Layout-topNav i.fa-power-off'; const logoutButton = '.at-Layout-topNav i.fa-power-off';
this this
// protective wait for immediate login/logout
.waitForElementNotPresent('.LoginModal-backDrop')
.waitForElementNotVisible('.spinny')
.findThenClick(logoutButton, 'css') .findThenClick(logoutButton, 'css')
.waitForElementPresent('#login-button'); .waitForElementPresent('#login-button');
}; };

17
awx/ui/test/e2e/tests/test-websockets.js
View File

@@ -1,8 +1,6 @@
/* Websocket tests. These tests verify that items like the sparkline (colored box rows which /* Websocket tests. These tests verify that items like the sparkline (colored box rows which
* display job status) and other status icons update correctly as the jobs progress. * display job status) and other status icons update correctly as the jobs progress.
*/ */
import uuid from 'uuid';
import { import {
getInventorySource, getInventorySource,
getOrganization, getOrganization,
@@ -15,8 +13,7 @@ import {
import { import {
AWX_E2E_URL, AWX_E2E_URL,
AWX_E2E_TIMEOUT_ASYNC, AWX_E2E_TIMEOUT_ASYNC,
AWX_E2E_TIMEOUT_LONG, AWX_E2E_TIMEOUT_LONG
AWX_E2E_TIMEOUT_SHORT,
} from '../settings'; } from '../settings';
let data; let data;
@@ -62,9 +59,8 @@ module.exports = {
.useCss() .useCss()
.navigateTo(`${AWX_E2E_URL}/#/home`, false); .navigateTo(`${AWX_E2E_URL}/#/home`, false);
getJob('test-websockets', 'debug.yml', 'test-websockets-successful', false); getJob('test-websockets', 'debug.yml', 'test-websockets-successful', false);
client.useXpath().expect.element(`${sparklineIcon}[1]${running}`) client.useXpath().expect.element(`${sparklineIcon}[1]${running}`)
.to.be.visible.before(AWX_E2E_TIMEOUT_ASYNC); .to.be.present.before(AWX_E2E_TIMEOUT_ASYNC);
client.useXpath().expect.element(`${successfulJt}${sparklineIcon}[1]${success}`) client.useXpath().expect.element(`${successfulJt}${sparklineIcon}[1]${success}`)
.to.be.present.before(AWX_E2E_TIMEOUT_ASYNC); .to.be.present.before(AWX_E2E_TIMEOUT_ASYNC);
}, },
@@ -74,9 +70,8 @@ module.exports = {
.useCss() .useCss()
.navigateTo(`${AWX_E2E_URL}/#/home`, false); .navigateTo(`${AWX_E2E_URL}/#/home`, false);
getJob('test-websockets', 'fail_unless.yml', 'test-websockets-failed', false); getJob('test-websockets', 'fail_unless.yml', 'test-websockets-failed', false);
client.useXpath().expect.element(`${sparklineIcon}[1]${running}`) client.useXpath().expect.element(`${sparklineIcon}[1]${running}`)
.to.be.visible.before(AWX_E2E_TIMEOUT_ASYNC); .to.be.present.before(AWX_E2E_TIMEOUT_ASYNC);
client.useXpath().expect.element(`${failedJt}${sparklineIcon}[1]${fail}`) client.useXpath().expect.element(`${failedJt}${sparklineIcon}[1]${fail}`)
.to.be.present.before(AWX_E2E_TIMEOUT_ASYNC); .to.be.present.before(AWX_E2E_TIMEOUT_ASYNC);
}, },
@@ -95,9 +90,9 @@ module.exports = {
getUpdatedProject('test-websockets'); // occasionally 1st update is too quick getUpdatedProject('test-websockets'); // occasionally 1st update is too quick
client.expect.element('i.icon-job-running') client.expect.element('i.icon-job-running')
.to.be.visible.before(AWX_E2E_TIMEOUT_ASYNC); .to.be.present.before(AWX_E2E_TIMEOUT_ASYNC);
client.expect.element('i.icon-job-success') client.expect.element('i.icon-job-success')
.to.be.visible.before(AWX_E2E_TIMEOUT_ASYNC); .to.be.present.before(AWX_E2E_TIMEOUT_ASYNC);
}, },
'Test successful job within an organization view': client => { 'Test successful job within an organization view': client => {
@@ -152,7 +147,7 @@ module.exports = {
client.expect.element('i.icon-job-running') client.expect.element('i.icon-job-running')
.to.be.visible.before(AWX_E2E_TIMEOUT_ASYNC); .to.be.visible.before(AWX_E2E_TIMEOUT_ASYNC);
client.expect.element('i.icon-job-success') client.expect.element('i.icon-job-success')
.to.be.visible.before(AWX_E2E_TIMEOUT_ASYNC); .to.be.present.before(AWX_E2E_TIMEOUT_ASYNC);
}, },
'Test job slicing sparkline behavior': client => { 'Test job slicing sparkline behavior': client => {
client.navigateTo(`${AWX_E2E_URL}/#/home`, false); client.navigateTo(`${AWX_E2E_URL}/#/home`, false);