From 810ece57bddf404b921fcb229e2008ad20e30e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@grafana.com>
Date: Tue, 4 May 2021 14:23:26 +0200
Subject: [PATCH] Chore: Adds better logging and longer timeout threshold
 (#33690)

---
 e2e/run-suite                                    | 2 +-
 e2e/start-server                                 | 1 +
 packages/grafana-e2e/cypress/support/commands.ts | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/e2e/run-suite b/e2e/run-suite
index 267c06ac97d..c72e715cf87 100755
--- a/e2e/run-suite
+++ b/e2e/run-suite
@@ -28,5 +28,5 @@ fi
 cd packages/grafana-e2e
 
 yarn $CMD --env BASE_URL=$URL,SLOWMO=$SLOWMO \
-  --config integrationFolder=../../e2e/$SUITE/specs,screenshotsFolder=../../e2e/$SUITE/screenshots,videosFolder=../../e2e/$SUITE/videos,fileServerFolder=./cypress,viewportWidth=1920,viewportHeight=1080,trashAssetsBeforeRuns=false \
+  --config defaultCommandTimeout=30000,integrationFolder=../../e2e/$SUITE/specs,screenshotsFolder=../../e2e/$SUITE/screenshots,videosFolder=../../e2e/$SUITE/videos,fileServerFolder=./cypress,viewportWidth=1920,viewportHeight=1080,trashAssetsBeforeRuns=false \
   $PARAMS
diff --git a/e2e/start-server b/e2e/start-server
index 24105ae5d1a..059085268f7 100755
--- a/e2e/start-server
+++ b/e2e/start-server
@@ -52,6 +52,7 @@ $RUNDIR/bin/grafana-server \
   --homepath=$RUNDIR \
   --pidfile=$RUNDIR/pid \
   cfg:server.http_port=$PORT \
+  cfg:server.router_logging=1 \
   cfg:app_mode=development
 
 # 2>&1 > $RUNDIR/output.log &
diff --git a/packages/grafana-e2e/cypress/support/commands.ts b/packages/grafana-e2e/cypress/support/commands.ts
index 4413d0cc4a2..a390bbe43f4 100644
--- a/packages/grafana-e2e/cypress/support/commands.ts
+++ b/packages/grafana-e2e/cypress/support/commands.ts
@@ -14,7 +14,7 @@ Cypress.Commands.add('compareScreenshots', (config: CompareScreenshotsConfig | s
 });
 
 Cypress.Commands.add('logToConsole', (message: string, optional?: any) => {
-  cy.task('log', { message, optional });
+  cy.task('log', { message: '(' + new Date().toISOString() + ') ' + message, optional });
 });
 
 Cypress.Commands.add('readProvisions', (filePaths: string[]) => {