From d9320e37f4089cfb8943cb29bc5978e45e9a4426 Mon Sep 17 00:00:00 2001
From: Steven Vachon <contact@svachon.com>
Date: Thu, 10 Sep 2020 11:40:44 -0400
Subject: [PATCH] @grafana/e2e: avoid query data flakiness (#27511)

---
 packages/grafana-e2e/src/flows/configurePanel.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-e2e/src/flows/configurePanel.ts b/packages/grafana-e2e/src/flows/configurePanel.ts
index 3e57ca4ef5f..970c9cf0a1e 100644
--- a/packages/grafana-e2e/src/flows/configurePanel.ts
+++ b/packages/grafana-e2e/src/flows/configurePanel.ts
@@ -127,9 +127,15 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
     // @todo instead wait for '@pluginModule'
     e2e().wait(2000);
 
-    e2e().wait('@chartData');
-
     if (!isExplore) {
+      // Avoid cache flakiness (where @chartData isn't requested)
+      e2e()
+        .get('.refresh-picker-buttons .btn')
+        .first()
+        .click({ force: true });
+
+      e2e().wait('@chartData');
+
       // `panelTitle` is needed to edit the panel, and unlikely to have its value changed at that point
       const changeTitle = panelTitle && !isEdit;