From f23ae65364b98330a270f6ad422d20537162479f Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Sun, 17 Dec 2023 11:57:45 +0100
Subject: [PATCH 1/2] Fix DQMOfflineConfiguration unit tests

---
 DQMOffline/Configuration/test/BuildFile.xml |  4 ++--
 DQMOffline/Configuration/test/runrest.sh    | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100755 DQMOffline/Configuration/test/runrest.sh

diff --git a/DQMOffline/Configuration/test/BuildFile.xml b/DQMOffline/Configuration/test/BuildFile.xml
index 4334126214c15..7e3889dabe548 100644
--- a/DQMOffline/Configuration/test/BuildFile.xml
+++ b/DQMOffline/Configuration/test/BuildFile.xml
@@ -4,12 +4,12 @@
 <test name="GetTestDQMOfflineConfigurationFile" command="edmCopyUtil ${INFILE} $(LOCALTOP)/tmp/"/>
 
 <!-- To make the tests run in parallel, we chunk up the work into arbitrary sets of 10 sequences. -->
-<test name="TestDQMOfflineConfiguration" command="runtests.sh   ${step_value} ${value} file://${LOCALTOP}/tmp/${INFILE_NAME}" for="0,290,10">
+<test name="TestDQMOfflineConfiguration" command="runtests.sh   ${step_value} ${value} file://${LOCALTOP}/tmp/${INFILE_NAME}" for="0,300,10">
   <flags PRE_TEST="GetTestDQMOfflineConfigurationFile"/>
 </test>
 
 <!-- To make sure we actually got all sequences, the last check checks that there are no sequences beyond the last test -->
 <!-- This might need to updated when the number of distinct sequences grows, add more rows above and change the number here. -->
-<test name="TestDQMOfflineConfigurationGotAll" command="cmsswSequenceInfo.py --runTheMatrix --steps DQM,VALIDATION --infile file://${LOCALTOP}/tmp/${INFILE_NAME} --limit 50 --offset 300 --threads 1 | grep 'Analyzing 0 seqs'">
+<test name="TestDQMOfflineConfigurationGotAll" command="runrest.sh file://${LOCALTOP}/tmp/${INFILE_NAME} 310">
   <flags PRE_TEST="GetTestDQMOfflineConfigurationFile"/>
 </test>
diff --git a/DQMOffline/Configuration/test/runrest.sh b/DQMOffline/Configuration/test/runrest.sh
new file mode 100755
index 0000000000000..bc8b32bbab409
--- /dev/null
+++ b/DQMOffline/Configuration/test/runrest.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+ERR=0
+PYTHONUNBUFFERED=1 cmsswSequenceInfo.py --runTheMatrix --steps DQM,VALIDATION --infile $1 --offset $2 --dbfile sequences$2.db --threads 1 >run.log 2>&1 || ERR=1
+cat run.log
+seqs=$(grep 'Analyzing [0-9][0-9]* seqs' run.log | sed 's|.*Analyzing *||;s| .*||')
+echo "Sequences run by final DQMOfflineConfiguration: $seqs"
+if [ "$seqs" -gt 0 ] ; then
+  echo "Final DQMOfflineConfiguration should not run any sequences."
+  echo "Please update parameters for TestDQMOfflineConfiguration unittest run the extra sequences."
+  exit 1
+fi
+exit $ERR

From 095f214f2af99c06c2cb77235e6bc3e2d7ea9800 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Mon, 18 Dec 2023 10:16:23 +0100
Subject: [PATCH 2/2] Update runrest.sh

---
 DQMOffline/Configuration/test/runrest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DQMOffline/Configuration/test/runrest.sh b/DQMOffline/Configuration/test/runrest.sh
index bc8b32bbab409..83394ce77d5a8 100755
--- a/DQMOffline/Configuration/test/runrest.sh
+++ b/DQMOffline/Configuration/test/runrest.sh
@@ -6,7 +6,7 @@ seqs=$(grep 'Analyzing [0-9][0-9]* seqs' run.log | sed 's|.*Analyzing *||;s| .*|
 echo "Sequences run by final DQMOfflineConfiguration: $seqs"
 if [ "$seqs" -gt 0 ] ; then
   echo "Final DQMOfflineConfiguration should not run any sequences."
-  echo "Please update parameters for TestDQMOfflineConfiguration unittest run the extra sequences."
+  echo "Please update parameters for TestDQMOfflineConfiguration unittest to run the extra sequences."
   exit 1
 fi
 exit $ERR