Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix discover async search relative timerange test #197740

Merged
merged 10 commits into from
Nov 5, 2024
Merged

Fix discover async search relative timerange test #197740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e549257
tmp commit
lukasolson Oct 24, 2024
d9937bc
Merge branch 'main' into failing_test_search_session_relative_time_range
lukasolson Oct 25, 2024
ce38f02
Apparently .log isn't a thing
lukasolson Oct 25, 2024
3679c55
Open URL instead of navigating in browser
lukasolson Oct 29, 2024
eec0760
Fix mainUrl
lukasolson Oct 30, 2024
49fe0f7
Use absolute URL
lukasolson Oct 30, 2024
5ec13b4
final cleanup
lukasolson Oct 30, 2024
6a5a40e
Merge branch 'main' into failing_test_search_session_relative_time_range
lukasolson Nov 4, 2024
fe76015
Update comment
lukasolson Nov 4, 2024
3a87c2a
Merge branch 'failing_test_search_session_relative_time_range' of git…
lukasolson Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/plugins/data/server/search/session/session_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,8 @@ export class SearchSessionService implements ISearchSessionService {
const session = await this.get(deps, user, sessionId);
const requestHash = createRequestHash(searchRequest.params);
if (!Object.hasOwn(session.attributes.idMapping, requestHash)) {
this.logger.error(`SearchSessionService: getId | ${sessionId} | ${requestHash} not found`);
this.logger.debug(
this.logger.debug(`SearchSessionService: getId | ${sessionId} | ${requestHash} not found`);
this.logger.error(
`SearchSessionService: getId not found search with params: ${JSON.stringify(
searchRequest.params
)}`
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/page_objects/search_sessions_management_page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function SearchSessionsPageProvider({ getService, getPageObjects }: FtrPr
id: ((await row.getAttribute('data-test-search-session-id')) ?? '').split('id-')[1],
name: $.findTestSubject('sessionManagementNameCol').text().trim(),
status: $.findTestSubject('sessionManagementStatusLabel').attr('data-test-status'),
mainUrl: $.findTestSubject('sessionManagementNameCol').text(),
mainUrl: $.findTestSubject('sessionManagementNameCol').attr('href'),
created: $.findTestSubject('sessionManagementCreatedCol').text(),
expires: $.findTestSubject('sessionManagementExpiresCol').text(),
searchesCount: Number($.findTestSubject('sessionManagementNumSearchesCol').text()),
Expand Down
13 changes: 10 additions & 3 deletions x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
const kibanaServer = getService('kibanaServer');
const toasts = getService('toasts');

// FLAKY: https://github.com/elastic/kibana/issues/195955
describe.skip('discover async search', () => {
describe('discover async search', () => {
before(async () => {
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
await kibanaServer.importExport.load(
Expand Down Expand Up @@ -115,6 +114,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
it('relative timerange works', async () => {
await common.navigateToApp('discover');
await header.waitUntilLoadingHasFinished();
const url = await browser.getCurrentUrl();

await searchSessions.save();
await searchSessions.expectState('backgroundCompleted');
const searchSessionId = await getSearchSessionId();
Expand All @@ -125,8 +126,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
await searchSessionsManagement.goTo();
const searchSessionListBeforeRestore = await searchSessionsManagement.getList();
const searchesCountBeforeRestore = searchSessionListBeforeRestore[0].searchesCount;

// navigate to Discover
await searchSessionListBeforeRestore[0].view();
// Instead of clicking the link to navigate to Discover, we load Discover from scratch (just like we did when we
// ran the search session before saving). This ensures that the same number of requests are made.
// await searchSessionListBeforeRestore[0].view();
const restoreUrl = new URL(searchSessionListBeforeRestore[0].mainUrl, url).href;
await browser.navigateTo(restoreUrl);

await header.waitUntilLoadingHasFinished();
await searchSessions.expectState('restored');
expect(await discover.hasNoResults()).to.be(true);
Expand Down