Merge branch 'py312.PyJobTransforms-20240529' into 'main'

PyJobTransforms: Fix tests for python 3.12.

See merge request !71798

Tools/PyJobTransforms/CMakeLists.txt

-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( PyJobTransforms )
@@ -29,11 +29,11 @@ endfunction( _add_test )
 
 # Tests in the package:
 foreach( test Echo_tf Sleep_tf
-         transform TransformUtils trfAMI trfArgs trfDecorators trfEnv
-         trfExceptions trfExe trfExitCodes trfFileUtils trfGraph trfJobOptions trfLogger
-         trfMPTools trfReports trfReportsSignaledExit trfSignal trfSignatures
+         transform TransformUtils trfAMI trfArgs trfEnv
+         trfExceptions trfExe trfExitCodes trfGraph trfJobOptions trfLogger
+         trfMPTools trfReports trfReportsSignaledExit trfSignatures
          trfUtils trfUtilsDBRelease trfUtilsParallelJobProcessor trfUtilsParallelJobProcessorData
-         trfValidateRootFile trfValidation trfArgClasses )
+         trfValidation trfArgClasses )
       _add_test( ${test} py 300 )
 endforeach()
 

Tools/PyJobTransforms/test/test_trfDecorators.py

-#! /usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## @Package test_trfDecorators.py
-#  @brief Unittests for trfDecorators.py
-#  @author graeme.andrew.stewart@cern.ch
-#  @version $Id: test_trfDecorators.py 529035 2012-12-05 15:45:24Z graemes $
-
-import unittest
-
-import logging
-msg = logging.getLogger(__name__)
-
-# Allowable to import * from the package for which we are the test suite
-from PyJobTransforms.trfDecorators import *
-
-## Unittests for this module
-class trfDecoratorTests(unittest.TestCase):
-    pass
-
-if __name__ == '__main__':
-    unittest.main()
-

Tools/PyJobTransforms/test/test_trfFileUtils.py

-#! /usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## @Package test_trfFileUtils.py
-#  @brief Unittests for trfFileUtils.py
-#  @author graeme.andrew.stewart@cern.ch
-#  @version $Id: test_trfFileUtils.py 529035 2012-12-05 15:45:24Z graemes $
-
-import unittest
-
-import logging
-msg = logging.getLogger(__name__)
-
-# Allowable to import * from the package for which we are the test suite
-from PyJobTransforms.trfFileUtils import *
-
-
-## Unittests for this module
-# Write me!
-if __name__ == '__main__':
-    unittest.main()

Tools/PyJobTransforms/test/test_trfSignal.py

-#! /usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## @Package test_trfSignal.py
-#  @brief Unittests for trfSignal.py
-#  @author graeme.andrew.stewart@cern.ch
-#  @version $Id: test_trfSignal.py 529035 2012-12-05 15:45:24Z graemes $
-
-import unittest
-
-import logging
-msg = logging.getLogger(__name__)
-
-# Allowable to import * from the package for which we are the test suite
-from PyJobTransforms.trfSignal import *
-
-
-## Unittests for this module
-# Write me!
-if __name__ == '__main__':
-    unittest.main()

Tools/PyJobTransforms/test/test_trfUtilsParallelJobProcessor.py

 #! /usr/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 ## @Package test_ParallelJobProcessor.py
 #  @brief Unittests for trfUtils.py ParallelJobProcessor
@@ -72,8 +72,9 @@ def exception():
 
 ## @brief unit tests for the parallel job processor
 class TestParallelJobProcessor(unittest.TestCase):
-    # Disable for now
-    pass
+    # Dummy test --- in python3.12, unittest fails if there are no tests.
+    def test_dummy(self):
+        return
     
     
     ## @brief unit test for working functions

Tools/PyJobTransforms/test/test_trfUtilsParallelJobProcessorData.py

 #! /usr/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 ## @Package test_ParallelJobProcessorData.py
 #  @brief Unittests for output file validation using trfUtils.py
@@ -30,8 +30,9 @@ fileBS1   = "/afs/cern.ch/atlas/project/rig/referencefiles/dataStreams_high_mu/d
 ## @brief unit tests for output data file validation using the parallel job
 #  processor
 class TestOutputFileValidationInParallel(unittest.TestCase):
-    # Disable for now
-    pass
+    # Dummy test --- in python3.12, unittest fails if there are no tests.
+    def test_dummy(self):
+        return
     
 # 
 #     ## @brief unit test for AOD

Tools/PyJobTransforms/test/test_trfValidateRootFile.py

-#! /usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## @Package test_trfValidateRootFile.py
-#  @brief Unittests for trfValidateRootFile.py
-#  @author graeme.andrew.stewart@cern.ch
-#  @version $Id: test_trfValidateRootFile.py 529035 2012-12-05 15:45:24Z graemes $
-
-import unittest
-
-import logging
-msg = logging.getLogger(__name__)
-
-# Allowable to import * from the package for which we are the test suite
-from PyJobTransforms.trfValidateRootFile import *
-
-
-## Unittests for this module
-# Write me!
-if __name__ == '__main__':
-    unittest.main()