From 7859fec92e3ffcc6f1da02955b3d45c92f48c8eb Mon Sep 17 00:00:00 2001
From: Miroslav Saur <miroslav.saur@cern.ch>
Date: Sun, 10 Aug 2025 16:58:56 +0000
Subject: [PATCH] Merge branch 'msaur_mooreonline_gaudi_v40' into 'master'

Prepare for drop of QMTest support in Gaudi

See merge request lhcb/MooreOnline!651

(cherry picked from commit a897fd2251d100d47e53fcd7658e7d2bf33626ab)

25ce50a4 Prepare for drop of QMTest support in Gaudi

Co-authored-by: Miroslav Saur <miroslav.saur@cern.ch>
---
 AllenOnline/python/AllenOnline/qmtest/exclusions.py   | 2 +-
 AllenOnline/tests/qmtest/decode_tae_output.qmt        | 2 +-
 MooreScripts/python/MooreScripts/qmtest/exclusions.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AllenOnline/python/AllenOnline/qmtest/exclusions.py b/AllenOnline/python/AllenOnline/qmtest/exclusions.py
index d80ddb2e4..fb10cbdfa 100644
--- a/AllenOnline/python/AllenOnline/qmtest/exclusions.py
+++ b/AllenOnline/python/AllenOnline/qmtest/exclusions.py
@@ -9,7 +9,7 @@
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
 from GaudiConf.QMTest.LHCbTest import BlockSkipper
-from GaudiTesting.BaseTest import RegexpReplacer, LineSkipper
+from GaudiConf.QMTest.BaseTest import RegexpReplacer, LineSkipper
 from GaudiConf.QMTest.LHCbExclusions import preprocessor as LHCbPreprocessor
 from RecConf.QMTest.exclusions import preprocessor as RecPreprocessor
 from Moore.qmtest.exclusions import skip_scheduler
diff --git a/AllenOnline/tests/qmtest/decode_tae_output.qmt b/AllenOnline/tests/qmtest/decode_tae_output.qmt
index 571d21e3e..f6f6ee52a 100644
--- a/AllenOnline/tests/qmtest/decode_tae_output.qmt
+++ b/AllenOnline/tests/qmtest/decode_tae_output.qmt
@@ -26,7 +26,7 @@ Run CPU decoding on Allen MDF output created from MEP input
   <argument name="validator"><text>
 
 from Moore.qmtest.exclusions import remove_known_warnings
-from GaudiTesting.BaseTest import LineSkipper
+from GaudiConf.QMTest.BaseTest import LineSkipper
 
 <!--
   "Misordered channel" issue noticed by SciFi group: https://gitlab.cern.ch/lhcb-scifi/scifi-software-development-and-maintenance/-/issues/7
diff --git a/MooreScripts/python/MooreScripts/qmtest/exclusions.py b/MooreScripts/python/MooreScripts/qmtest/exclusions.py
index a51020270..3d60cca8c 100644
--- a/MooreScripts/python/MooreScripts/qmtest/exclusions.py
+++ b/MooreScripts/python/MooreScripts/qmtest/exclusions.py
@@ -8,7 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from GaudiTesting.BaseTest import LineSkipper
+from GaudiConf.QMTest.BaseTest import LineSkipper
 from Moore.qmtest.exclusions import remove_known_warnings
 
 remove_known_warnings = remove_known_warnings + LineSkipper(strings=[
-- 
GitLab