From ef06286cd2b81257c273711bf4ede5f7ceedb37b Mon Sep 17 00:00:00 2001
From: Peter Hedenskog <phedenskog@wikimedia.org>
Date: Mon, 16 Sep 2024 09:12:14 +0200
Subject: [PATCH] Setup direct tests.

Cleanup configuration for direct tests. Use latest and greatest
configuration. Removed secrets to make it easy to try locally,
lets add that in a smarter way later so we can make it easy to
run the configuration locally.

There's one upstream bug in Browsertime that needs to be fixed:
https://github.com/sitespeedio/browsertime/issues/2180

Bug: T374590
Change-Id: I2e074d23a01c94c691f5a884186d067d745843e2
---
 config/direct.json         | 17 +++++++++--------
 direct.sh                  |  4 ----
 tests/direct/enwiki.txt    |  5 +++++
 tests/direct/firstView.txt |  6 ------
 tests/direct/group0.txt    |  3 +++
 tests/direct/group1.txt    |  5 +++++
 6 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 tests/direct/enwiki.txt
 delete mode 100644 tests/direct/firstView.txt
 create mode 100644 tests/direct/group0.txt
 create mode 100644 tests/direct/group1.txt

diff --git a/config/direct.json b/config/direct.json
index d9af0ed..c2ed1cc 100644
--- a/config/direct.json
+++ b/config/direct.json
@@ -1,5 +1,4 @@
 {
-    "extends": "../../secrets.json",
     "utc": true,
     "gzipHAR": true,
     "html": {
@@ -15,10 +14,6 @@
         "coach"
       ]
     },
-    "graphite": {
-      "messages": ["pageSummary", "run"]
-    },
-    "copyLatestFilesToBaseGraphiteNamespace": true,
     "android": true,
     "browsertime": {
       "cpu": true,
@@ -31,9 +26,15 @@
       "cacheClearRaw": true,
       "video": true,
       "visualMetrics": true,
-      "visualMetricsPortable": true,
-      "androidRooted": true,
-      "androidVerifyNetwork": true,
+      "android": {
+        "gnirehtet": true,
+        "rooted": true
+      },
+      "connectivity": {
+        "engine": "throttle",
+        "profile": "4g"
+      },
+      "pageCompleteCheckNetworkIdle": true,
       "chrome": {
         "traceCategory": ["disabled-by-default-v8.cpu_profiler"],
         "collectConsoleLog": true,
diff --git a/direct.sh b/direct.sh
index a8e156b..b271247 100755
--- a/direct.sh
+++ b/direct.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# Python3 is installed in two locations in the container
-# make sure we use the correct one in Visual Metrics
-export PYTHON=/usr/local/bin/python3
-
 # Run tests directly against Wikipedia
 FILE=$1
 BROWSER=$2
diff --git a/tests/direct/enwiki.txt b/tests/direct/enwiki.txt
new file mode 100644
index 0000000..ecca650
--- /dev/null
+++ b/tests/direct/enwiki.txt
@@ -0,0 +1,5 @@
+https://en.m.wikipedia.org/wiki/Facebook
+https://en.m.wikipedia.org/wiki/Barack_Obama
+https://en.m.wikipedia.org/wiki/Sweden
+https://en.m.wikipedia.org/wiki/Main_Page
+https://www.wikipedia.org
diff --git a/tests/direct/firstView.txt b/tests/direct/firstView.txt
deleted file mode 100644
index f1678af..0000000
--- a/tests/direct/firstView.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-https://vi.m.wikipedia.org/wiki/Trang_Chính main
-https://vi.m.wikipedia.org/wiki/Tự_nhiên page1
-https://vi.m.wikipedia.org/wiki/Josee:_Khi_nàng_thơ_yêu page2
-https://en.m.wikipedia.org/wiki/Barack_Obama
-https://en.m.wikipedia.org/wiki/Sweden
-https://en.m.wikipedia.org/wiki/Facebook
\ No newline at end of file
diff --git a/tests/direct/group0.txt b/tests/direct/group0.txt
new file mode 100644
index 0000000..f38c080
--- /dev/null
+++ b/tests/direct/group0.txt
@@ -0,0 +1,3 @@
+https://m.mediawiki.org/wiki/MediaWiki
+https://m.mediawiki.org/wiki/Download
+https://m.mediawiki.org/wiki/How_to_contribute
diff --git a/tests/direct/group1.txt b/tests/direct/group1.txt
new file mode 100644
index 0000000..edd3a21
--- /dev/null
+++ b/tests/direct/group1.txt
@@ -0,0 +1,5 @@
+https://it.m.wikipedia.org/wiki/Jannik_Sinner
+https://it.m.wikipedia.org/wiki/Juventus_Football_Club
+https://it.m.wikipedia.org/wiki/Rai
+https://it.m.wikipedia.org/wiki/Facebook
+https://it.m.wikipedia.org/wiki/Italia