From 5c2e0c374c4d301acd06b924c9728befd603f5e9 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Mon, 23 Jan 2023 13:01:36 +0200 Subject: [PATCH] [v9.3.x] grafana/e2e: Add ability to customise scenario config (#60705) grafana/e2e: Add ability to customise scenario config (#60646) * Add ability to retry e2e test scenarios * Add wait and remove retries * Revert retry logic and elaborate on 15s wait time * No need to update datasource name now (cherry picked from commit c34aa05548715d91f02d4597c0f0a933b2a68266) Co-authored-by: Andreas Christou --- e2e/cloud-plugins-suite/azure-monitor.spec.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/e2e/cloud-plugins-suite/azure-monitor.spec.ts b/e2e/cloud-plugins-suite/azure-monitor.spec.ts index 17ca92666f0..32844502d07 100644 --- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts +++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts @@ -43,8 +43,12 @@ function provisionAzureMonitorDatasources(datasources: AzureMonitorProvision[]) .type(datasource.secureJsonData.clientSecret, { log: false }); e2eSelectors.configEditor.loadSubscriptions.button().click().wait('@subscriptions').wait(500); e2eSelectors.configEditor.defaultSubscription.input().find('input').type('datasources{enter}'); + // Wait for 15s so that credentials are ready. 5s has been tested locally before and seemed insufficient. + e2e().wait(15000); }, expectedAlertMessage: 'Successfully connected to all Azure Monitor endpoints', + // Reduce the timeout from 30s to error faster when an invalid alert message is presented + timeout: 10000, }); }