Skip to content

Commit fa341c5

Browse files
ritvibhattRitvi Bhatt
and
Ritvi Bhatt
authored
fix flaky observability 1.3 tests (#1742)
Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com> Co-authored-by: Ritvi Bhatt <ribhatt@amazon.com>
1 parent 8b29713 commit fa341c5

File tree

7 files changed

+20
-24
lines changed

7 files changed

+20
-24
lines changed

.github/workflows/cypress-workflow-bundle-snapshot-based.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ jobs:
7575
command: yarn cypress:run-with-security --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js'
7676
wait-on: 'http://localhost:5601'
7777
# Screenshots are only captured on failure, will change this once we do visual regression tests
78-
- uses: actions/upload-artifact@v1
78+
- uses: actions/upload-artifact@v4
7979
if: failure()
8080
with:
8181
name: cypress-screenshots
8282
path: monterey-test/cypress/screenshots
8383
# Test run video was always captured, so this action uses "always()" condition
84-
- uses: actions/upload-artifact@v1
84+
- uses: actions/upload-artifact@v4
8585
if: always()
8686
with:
8787
name: cypress-videos

.github/workflows/cypress-workflow-plugins-bundle-snapshot-based.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ jobs:
7676
command: yarn cypress:run-plugin-tests-with-security
7777
wait-on: 'http://localhost:5601'
7878
# Screenshots are only captured on failure, will change this once we do visual regression tests
79-
- uses: actions/upload-artifact@v1
79+
- uses: actions/upload-artifact@v4
8080
if: failure()
8181
with:
8282
name: cypress-screenshots
8383
path: monterey-test/cypress/screenshots
8484
# Test run video was always captured, so this action uses "always()" condition
85-
- uses: actions/upload-artifact@v1
85+
- uses: actions/upload-artifact@v4
8686
if: always()
8787
with:
8888
name: cypress-videos

.github/workflows/cypress-workflow-vanilla-snapshot-based.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@ jobs:
7474
command: yarn cypress:run-without-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/vanilla-opensearch-dashboards/*.js'
7575
wait-on: 'http://localhost:5601'
7676
# Screenshots are only captured on failure, will change this once we do visual regression tests
77-
- uses: actions/upload-artifact@v1
77+
- uses: actions/upload-artifact@v4
7878
if: failure()
7979
with:
8080
name: cypress-screenshots
8181
path: monetery-test/cypress/screenshots
8282
# Test run video was always captured, so this action uses "always()" condition
83-
- uses: actions/upload-artifact@v1
83+
- uses: actions/upload-artifact@v4
8484
if: always()
8585
with:
8686
name: cypress-videos
8787
path: monetery-test/cypress/videos
8888
# Test reports was always captured, so this action uses "always()" condition
89-
- uses: actions/upload-artifact@v1
89+
- uses: actions/upload-artifact@v4
9090
if: always()
9191
with:
9292
name: cypress-results

cypress/integration/plugins/observability-dashboards/3_trace_analytics_traces.spec.js

-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ describe('Testing traces table', () => {
3535

3636
it('Renders the traces table', () => {
3737
cy.contains(' (108)').should('exist');
38-
cy.contains('03/25/2021 10:23:45').should('exist');
3938
cy.contains('03f9c770db5ee2f1caac0...').should('exist');
4039
cy.contains('224.99').should('exist');
4140

@@ -50,7 +49,6 @@ describe('Testing traces table', () => {
5049
cy.get('.euiButton__text').contains('Refresh').click();
5150
cy.wait(delayTime);
5251
cy.contains(' (1)').should('exist');
53-
cy.contains('03/25/2021 10:21:22').should('exist');
5452
});
5553
});
5654

@@ -67,7 +65,6 @@ describe('Testing trace view', () => {
6765
it('Renders the trace view', () => {
6866
cy.contains('43.75%').should('exist');
6967
cy.contains('42.58%').should('exist');
70-
cy.contains('03/25/2021 10:21:22').should('exist');
7168
cy.get('h2.euiTitle').contains(TRACE_ID).should('exist');
7269

7370
cy.get('div.js-plotly-plot').should('have.length.gte', 2);

cypress/integration/plugins/observability-dashboards/4_panels.spec.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,9 @@ describe('Testing a panel', () => {
217217
});
218218

219219
it('Add existing visualization #1', () => {
220-
cy.get('.euiButton__text').contains('Add visualization').click();
220+
cy.get('.euiButton__text').contains('Add Visualization').click();
221221
cy.wait(panelDelay);
222-
cy.get('.euiContextMenuItem__text').contains('Select existing visualization').click();
222+
cy.get('.euiContextMenuItem__text').contains('Select Existing Visualization').click();
223223
cy.wait(panelDelay);
224224
cy.get('select').select(PPL_VISUALIZATIONS_NAMES[0]);
225225
cy.get('button[aria-label="refreshPreview"]').click();
@@ -231,9 +231,9 @@ describe('Testing a panel', () => {
231231
});
232232

233233
it('Add existing visualization #2', () => {
234-
cy.get('.euiButton__text').contains('Add visualization').click();
234+
cy.get('.euiButton__text').contains('Add Visualization').click();
235235
cy.wait(panelDelay);
236-
cy.get('.euiContextMenuItem__text').contains('Select existing visualization').click();
236+
cy.get('.euiContextMenuItem__text').contains('Select Existing Visualization').click();
237237
cy.wait(panelDelay);
238238
cy.get('select').select(PPL_VISUALIZATIONS_NAMES[1]);
239239
cy.get('button[aria-label="refreshPreview"]').click();
@@ -245,7 +245,7 @@ describe('Testing a panel', () => {
245245
});
246246

247247
it('Add ppl filter to panel', () => {
248-
cy.get('[data-test-subj="searchAutocompleteTextArea"]').type("where Carrier = 'OpenSearch-Air'| where Dest = 'Munich Airport'", { delay: TYPING_DELAY });
248+
cy.get('[data-test-subj="searchAutocompleteTextArea"]').type("{selectall}{backspace}where Carrier = 'OpenSearch-Air'| where Dest = 'Munich Airport'", { delay: TYPING_DELAY });
249249
cy.get('.euiButton__text').contains('Refresh').click();
250250
cy.wait(panelDelay * 3);
251251
cy.get('.xtick').should('contain', 'OpenSearch-Air');
@@ -331,9 +331,9 @@ describe('Testing a panel', () => {
331331
});
332332

333333
it('Create new visualization and add to panel', () => {
334-
cy.get('.euiButton__text').contains('Add visualization').click();
334+
cy.get('.euiButton__text').contains('Add Visualization').click();
335335
cy.wait(panelDelay);
336-
cy.get('.euiContextMenuItem__text').contains('Create new visualization').click();
336+
cy.get('.euiContextMenuItem__text').contains('Create New Visualization').click();
337337
cy.wait(panelDelay * 3);
338338
cy.url().should('match', new RegExp('(.*)#/event_analytics/explorer'));
339339
cy.get('[id^=autocomplete-textarea]').type(PPL_VISUALIZATIONS[2]);
@@ -382,6 +382,7 @@ describe('Testing a panel', () => {
382382

383383
describe('Add samples and clean up all test data', () => {
384384
it('Add sample data', () => {
385+
cy.route2('**/api/observability/operational_panels/panels/addSamplePanels').as('samplePanels');
385386
moveToPanelHome();
386387
cy.get('.euiButton__text').contains('Actions').click();
387388
cy.wait(panelDelay);
@@ -392,9 +393,7 @@ describe('Add samples and clean up all test data', () => {
392393
.should('exist');
393394
cy.wait(panelDelay);
394395
cy.get('.euiButton__text').contains('Yes').click();
395-
cy.wait(panelDelay * 5);
396-
cy.get('.euiTableCellContent').contains(SAMPLE_PANEL).should('exist');
397-
cy.wait(panelDelay);
396+
cy.wait('@samplePanels').its('response.statusCode').should('eq', 200);
398397
});
399398

400399
it('Validate sample data', () => {

cypress/integration/plugins/observability-dashboards/5_event_analytics.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ describe('Switch on and off livetail', () => {
336336
cy.get('[data-test-subj="searchAutocompleteTextArea"]').type(TEST_QUERIES[1].query);
337337

338338
cy.get('[data-test-subj=eventLiveTail]').click();
339-
cy.get('[data-test-subj=eventLiveTail__delay10s]').click();
339+
cy.get('[data-test-subj=eventLiveTail__delay10]').click();
340340
cy.wait(delayTime * 2);
341341
cy.get('.euiToastHeader__title').contains('On').should('exist');
342342

@@ -355,7 +355,7 @@ describe('Live tail stop automatically', () => {
355355
cy.get('[data-test-subj="searchAutocompleteTextArea"]').type(TEST_QUERIES[1].query);
356356

357357
cy.get('[data-test-subj=eventLiveTail]').click();
358-
cy.get('[data-test-subj=eventLiveTail__delay10s]').click();
358+
cy.get('[data-test-subj=eventLiveTail__delay10]').click();
359359
cy.wait(delayTime * 2);
360360
cy.get('.euiToastHeader__title').contains('On').should('exist');
361361
});

cypress/utils/plugins/observability-dashboards/constants.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export const testIndexDataSet = [
3737
]
3838

3939
export const setTimeFilter = (setEndTime = false, refresh = true) => {
40-
const startTime = 'Mar 25, 2021 @ 10:00:00.000';
41-
const endTime = 'Mar 25, 2021 @ 11:00:00.000';
40+
const startTime = 'Mar 24, 2021 @ 00:00:00.000';
41+
const endTime = 'Mar 26, 2021 @ 00:00:00.000';
4242
cy.get('button.euiButtonEmpty[aria-label="Date quick select"]').click();
4343
cy.get('.euiQuickSelect__applyButton').click();
4444
cy.get('.euiSuperDatePicker__prettyFormatLink').click();

0 commit comments

Comments
 (0)