From ce70a6d4eef3d041847618a05a17d605acf18400 Mon Sep 17 00:00:00 2001
From: Justin Stephenson <jstephen@redhat.com>
Date: Wed, 3 May 2023 11:28:27 -0400
Subject: [PATCH] FMF: Run tests together

---
 plans/all.fmf            | 17 ++---------------
 test/browser/main.fmf    | 13 +------------
 test/browser/run-test.sh | 13 +------------
 3 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/plans/all.fmf b/plans/all.fmf
index 9e3e27a..2bce34a 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -1,19 +1,6 @@
+summary:
+    Run all tests
 discover:
     how: fmf
 execute:
     how: tmt
-
-/system:
-    summary: Run tests on system session-recording
-    discover+:
-        test: /test/browser/system
-
-/user:
-    summary: Run tests on user session-recording
-    discover+:
-        test: /test/browser/user
-
-/misc:
-    summary: Run other tests
-    discover+:
-        test: /test/browser/other
diff --git a/test/browser/main.fmf b/test/browser/main.fmf
index 17aeecc..73967c3 100644
--- a/test/browser/main.fmf
+++ b/test/browser/main.fmf
@@ -10,16 +10,5 @@ require:
   - make
   - nodejs
   - python3
+test: ./browser.sh
 duration: 30m
-
-/system:
-    test: ./browser.sh system
-    summary: Run *System tests
-
-/user:
-    test: ./browser.sh user
-    summary: Run *User tests
-
-/other:
-    test: ./browser.sh other
-    summary: Run all other tests
diff --git a/test/browser/run-test.sh b/test/browser/run-test.sh
index 7fec784..716197e 100755
--- a/test/browser/run-test.sh
+++ b/test/browser/run-test.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -eux
 
-PLAN="$1"
-
 # tests need cockpit's bots/ libraries and test infrastructure
 cd $SOURCE
 rm -f bots  # common local case: existing bots symlink
@@ -25,19 +23,10 @@ if [ "${TEST_OS#centos-}" != "$TEST_OS" ]; then
     TEST_OS="${TEST_OS}-stream"
 fi
 
-# select subset of tests according to plan
-TESTS="$(test/common/run-tests -l)"
-case "$PLAN" in
-    system) TESTS="$(echo "$TESTS" | grep 'System$')" ;;
-    user) TESTS="$(echo "$TESTS" | grep 'User$')" ;;
-    other) TESTS="$(echo "$TESTS" | grep -vE '(System|User)$')" ;;
-    *) echo "Unknown test plan: $PLAN" >&2; exit 1 ;;
-esac
-
 EXCLUDES=""
 
 RC=0
-test/common/run-tests --nondestructive --machine 127.0.0.1:22 --browser 127.0.0.1:9090 $TESTS $EXCLUDES || RC=$?
+test/common/run-tests --nondestructive --machine 127.0.0.1:22 --browser 127.0.0.1:9090 $EXCLUDES || RC=$?
 
 echo $RC > "$LOGS/exitcode"
 cp --verbose Test* "$LOGS" || true