Skip to content

Commit 8404b54

Browse files
committed
descrease navigation timeouts
1 parent a545eb6 commit 8404b54

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

test/functional/page_objects/common_page.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
3333
const find = getService('find');
3434
const globalNav = getService('globalNav');
3535
const testSubjects = getService('testSubjects');
36-
const kibanaServer = getService('kibanaServer');
3736
const PageObjects = getPageObjects(['shield']);
3837

3938
const defaultTryTimeout = config.get('timeouts.try');
@@ -92,7 +91,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
9291
private async loginIfPrompted(appUrl: string) {
9392
let currentUrl = await browser.getCurrentUrl();
9493
log.debug(`currentUrl = ${currentUrl}\n appUrl = ${appUrl}`);
95-
await find.byCssSelector('[data-test-subj="kibanaChrome"]', defaultTryTimeout * 2);
94+
await find.byCssSelector('[data-test-subj="kibanaChrome"]', 6 * defaultFindTimeout); // 60 sec waiting
9695
const loginPage = currentUrl.includes('/login');
9796
const wantedLoginPage = appUrl.includes('/login') || appUrl.includes('/logout');
9897

@@ -104,7 +103,10 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
104103
config.get('servers.kibana.username'),
105104
config.get('servers.kibana.password')
106105
);
107-
await find.byCssSelector('[data-test-subj="kibanaChrome"] nav:not(.ng-hide)', 20000);
106+
await find.byCssSelector(
107+
'[data-test-subj="kibanaChrome"] nav:not(.ng-hide)',
108+
2 * defaultFindTimeout
109+
);
108110
await browser.get(appUrl);
109111
currentUrl = await browser.getCurrentUrl();
110112
log.debug(`Finished login process currentUrl = ${currentUrl}`);
@@ -206,10 +208,9 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
206208

207209
log.debug('navigating to ' + appName + ' url: ' + appUrl);
208210

209-
await retry.tryForTime(defaultTryTimeout * 3, async () => {
211+
await retry.tryForTime(defaultTryTimeout * 2, async () => {
210212
let lastUrl = await retry.try(async () => {
211213
// since we're using hash URLs, always reload first to force re-render
212-
await kibanaServer.uiSettings.getDefaultIndex();
213214
await CommonPage.navigateToUrlAndHandleAlert(appUrl, shouldAcceptAlert);
214215
await this.sleep(700);
215216
log.debug('returned from get, calling refresh');
@@ -388,7 +389,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
388389
}
389390

390391
async getBodyText() {
391-
if (await find.existsByCssSelector('a[id=rawdata-tab]', 10000)) {
392+
if (await find.existsByCssSelector('a[id=rawdata-tab]', defaultFindTimeout)) {
392393
// Firefox has 3 tabs and requires navigation to see Raw output
393394
await find.clickByCssSelector('a[id=rawdata-tab]');
394395
}

0 commit comments

Comments
 (0)