Skip to content

Commit

Permalink
[8.x] [EDR Workflows] Unskip osquery tests (#196793) (#197122)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.x`:
- [[EDR Workflows] Unskip osquery tests
(#196793)](#196793)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Tomasz
Ciecierski","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-21T18:50:12Z","message":"[EDR
Workflows] Unskip osquery tests
(#196793)","sha":"2c25cc06588976cb90ec3551320fef3e8dbbecf4","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Defend
Workflows","v8.16.0","backport:version","v8.17.0"],"title":"[EDR
Workflows] Unskip osquery
tests","number":196793,"url":"https://github.com/elastic/kibana/pull/196793","mergeCommit":{"message":"[EDR
Workflows] Unskip osquery tests
(#196793)","sha":"2c25cc06588976cb90ec3551320fef3e8dbbecf4"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/196793","number":196793,"mergeCommit":{"message":"[EDR
Workflows] Unskip osquery tests
(#196793)","sha":"2c25cc06588976cb90ec3551320fef3e8dbbecf4"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Tomasz Ciecierski <[email protected]>
  • Loading branch information
kibanamachine and tomsonpl authored Oct 21, 2024
1 parent df11aea commit 3b401f3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ describe(
() => {
let ruleId: string;
let ruleName: string;
before(() => {
initializeDataViews();
});
beforeEach(() => {
initializeDataViews();
loadRule().then((data) => {
ruleId = data.id;
ruleName = data.name;
Expand Down
14 changes: 6 additions & 8 deletions x-pack/plugins/osquery/cypress/e2e/all/saved_queries.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,18 @@ describe('ALL - Saved queries', { tags: ['@ess', '@serverless'] }, () => {
cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns35');
cy.getBySel('dataGridColumnSelectorButton').click();
cy.get('[data-popover-open="true"]').should('be.visible');
cy.getBySel('dataGridColumnSelectorToggleColumnVisibility-osquery.cmdline').click();
cy.getBySel('dataGridColumnSelectorToggleColumnVisibility-osquery.cwd').click();
cy.getBySel(
'dataGridColumnSelectorToggleColumnVisibility-osquery.disk_bytes_written.number'
).click();
cy.getBySel('dataGridColumnSelectorColumnItem-osquery.cmdline').click();
cy.getBySel('dataGridColumnSelectorColumnItem-osquery.cwd').click();
cy.getBySel('dataGridColumnSelectorColumnItem-osquery.disk_bytes_written.number').click();
cy.getBySel('dataGridColumnSelectorButton').click();
cy.get('[data-popover-open="true"]').should('not.exist');
cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns32/35');
cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns35');

// change pagination
cy.getBySel('pagination-button-next').click();
cy.getBySel('globalLoadingIndicator').should('not.exist');
cy.getBySel('pagination-button-next').click();
cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns32/35');
cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns35');

// enter fullscreen
cy.getBySel(RESULTS_TABLE_BUTTON).trigger('mouseover');
Expand All @@ -116,7 +114,7 @@ describe('ALL - Saved queries', { tags: ['@ess', '@serverless'] }, () => {
// sorting
cy.getBySel('dataGridHeaderCellActionButton-osquery.egid').click({ force: true });
cy.contains(/Sort A-Z$/).click();
cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns32/35');
cy.getBySel(RESULTS_TABLE_COLUMNS_BUTTON).should('have.text', 'Columns35');
cy.getBySel(RESULTS_TABLE_BUTTON).trigger('mouseover');
cy.contains(/Enter fullscreen$/).should('exist');

Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/osquery_cypress/artifact_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
*/

export async function getLatestVersion(): Promise<string> {
return '8.11.0-SNAPSHOT';
return '8.15.0-SNAPSHOT';
}
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ export const waitForAlertsToPopulate = (alertCountThreshold = 1) => {
return alertCount >= alertCountThreshold;
});
},
{ interval: 500, timeout: 12000 }
{ interval: 500, timeout: 30000 }
);
waitForAlerts();
};
Expand Down

0 comments on commit 3b401f3

Please sign in to comment.