fix data source flaky tests (#1383)

* troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * troubleshoot Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com> (cherry picked from commit ba9ac55)
opensearch-project · Jun 12, 2024 · 9b699a0 · 9b699a0
1 parent 6a453ef
commit 9b699a0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/...dashboards/opensearch-dashboards/datasource-management-plugin/1_create_datasource.spec.js b/...dashboards/opensearch-dashboards/datasource-management-plugin/1_create_datasource.spec.js
@@ -43,6 +43,10 @@ if (Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')) {
     after(() => {
       // Clean up after all test are run
       cy.deleteAllDataSources();
+      // remove the default data source
+      cy.setAdvancedSetting({
+        defaultDataSource: '',
+      });
     });
 
     it('should successfully load the page', () => {

diff --git a/...-dashboards/opensearch-dashboards/datasource-management-plugin/2_datasource_table.spec.js b/...-dashboards/opensearch-dashboards/datasource-management-plugin/2_datasource_table.spec.js
@@ -24,6 +24,12 @@ if (Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')) {
     after(() => {
       // Clean up after all test are run
       cy.deleteAllDataSources();
+      // clear cache
+      cy.clearCache();
+      // remove the default data source
+      cy.setAdvancedSetting({
+        defaultDataSource: '',
+      });
     });
 
     it('should successfully load the page', () => {

diff --git a/...dashboards/opensearch-dashboards/datasource-management-plugin/3_update_datasource.spec.js b/...dashboards/opensearch-dashboards/datasource-management-plugin/3_update_datasource.spec.js
@@ -51,6 +51,10 @@ if (Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')) {
     after(() => {
       // Clean up after all test are run
       cy.deleteAllDataSources();
+      // remove the default data source
+      cy.setAdvancedSetting({
+        defaultDataSource: '',
+      });
     });
 
     it('should successfully load the listing page & have 2 records in table', () => {

diff --git a/...oards/opensearch-dashboards/datasource-management-plugin/4_set_default_datasource.spec.js b/...oards/opensearch-dashboards/datasource-management-plugin/4_set_default_datasource.spec.js
@@ -26,7 +26,11 @@ if (Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')) {
       });
       after(() => {
         // Clean up after all test are run
-        cy.deleteAllDataSourcesOnUI();
+        cy.deleteAllDataSources();
+        // remove the default data source
+        cy.setAdvancedSetting({
+          defaultDataSource: '',
+        });
       });
       it('The first data source is the default data source', () => {
         cy.visitDataSourcesListingPage();

diff --git a/cypress/utils/dashboards/datasource-management-dashboards-plugin/commands.js b/cypress/utils/dashboards/datasource-management-dashboards-plugin/commands.js
@@ -302,7 +302,8 @@ Cypress.Commands.add('singleDeleteDataSourceByTitle', (dataSourceTitle) => {
     .should('exist') // Ensure the button exists
     .should('be.visible') // Ensure the button is visible
     .click({ force: true }); // Click the button
-  cy.wait(1000);
+
+  cy.wait(2000);
   cy.visitDataSourcesListingPage();
 });