[roottest] Remove remnants of legacy_pyroot from tests

The so-called `legacy_pyroot` is not available for a long time anymore,
and remnants of it should be deleted from the tests.

Author: guitargeek

roottest/python/CMakeLists.txt

@@ -1,9 +1,4 @@
 if(ROOT_pyroot_FOUND)
-  if (ROOT_pyroot_legacy_FOUND)
-    set(legacy_pyroot True)
-  else()
-    set(legacy_pyroot False)
-  endif()
 
   if(ROOT_roofit_FOUND)
     set(roofit True)

roottest/python/basic/CMakeLists.txt

@@ -2,17 +2,15 @@ if(ROOT_pyroot_FOUND)
   ROOTTEST_ADD_TEST(basic
                     MACRO PyROOT_basictests.py
                     COPY_TO_BUILDDIR ArgumentPassingCompiled.C ReturnValues.C SimpleClass.C ArgumentPassingInterpreted.C
-                    PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ ArgumentPassingCompiled.C+
-                    ENVIRONMENT LEGACY_PYROOT=${legacy_pyroot})
+                    PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ ArgumentPassingCompiled.C+)
 
 if(NOT MSVC OR win_broken_tests)
   ROOTTEST_ADD_TEST(datatype
                     MACRO PyROOT_datatypetest.py
                     COPY_TO_BUILDDIR DataTypes.C DataTypes.h
                     PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ DataTypes.C+
                     ENVIRONMENT CLING_STANDARD_PCH=none
-                                CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/libcppyy_backend.so
-                                ENVIRONMENT LEGACY_PYROOT=${legacy_pyroot})
+                                CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/libcppyy_backend.so)
 endif()
 
   ROOTTEST_ADD_TEST(operator
@@ -26,7 +24,6 @@ if(NOT MSVC OR win_broken_tests)
                     COPY_TO_BUILDDIR Overloads.C Overloads.h
                     PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ Overloads.C+
                     ENVIRONMENT CLING_STANDARD_PCH=none
-                                CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/libcppyy_backend.so
-                                ENVIRONMENT LEGACY_PYROOT=${legacy_pyroot})
+                                CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/libcppyy_backend.so)
 endif()
 endif()

roottest/python/basic/PyROOT_basictests.py

@@ -258,10 +258,6 @@ def test9ByRefPassing( self ):
 
 ### basic extension features test cases ======================================
 class Basic5PythonizationTestCase( MyTestCase ):
-   @classmethod
-   def setUpClass(cls):
-      cls.legacy_pyroot = os.environ.get('LEGACY_PYROOT') == 'True'
-
    def test1Strings( self ):
       """Test string/TString/TObjString compatibility"""
 
@@ -346,20 +342,17 @@ def make_obj_str(s):
       l.insert(  3, make_obj_str('6') )
       l.insert( 20, make_obj_str('7') )
       l.insert( -1, make_obj_str('8') )
-      if not self.legacy_pyroot:
-         # The pythonisation of TSeqCollection in experimental PyROOT mimics the
-         # behaviour of the Python list, in this case for insert.
-         # The Python list insert always inserts before the specified index, so if
-         # -1 is specified, insert will place the new element right before the last
-         # element of the list.
-         self.assertEqual(list(l), ['a', 'b', '1', '6', '2', 'i', 'j', '3', '4', '5', 'j', '8', '7'])
-         # Re-synchronize with current PyROOT's list
-         l.insert(0, make_obj_str('8'))
-         self.assertEqual(list(l), ['8', 'a', 'b', '1', '6', '2', 'i', 'j', '3', '4', '5', 'j', '8', '7'])
-         l.pop(-2)
-         self.assertEqual(list(l), ['8', 'a', 'b', '1', '6', '2', 'i', 'j', '3', '4', '5', 'j', '7'])
-      else:
-         self.assertEqual(list(l), ['8', 'a', 'b', '1', '6', '2', 'i', 'j', '3', '4', '5', 'j', '7'])
+      # The pythonisation of TSeqCollection in experimental PyROOT mimics the
+      # behaviour of the Python list, in this case for insert.
+      # The Python list insert always inserts before the specified index, so if
+      # -1 is specified, insert will place the new element right before the last
+      # element of the list.
+      self.assertEqual(list(l), ['a', 'b', '1', '6', '2', 'i', 'j', '3', '4', '5', 'j', '8', '7'])
+      # Re-synchronize with current PyROOT's list
+      l.insert(0, make_obj_str('8'))
+      self.assertEqual(list(l), ['8', 'a', 'b', '1', '6', '2', 'i', 'j', '3', '4', '5', 'j', '8', '7'])
+      l.pop(-2)
+      self.assertEqual(list(l), ['8', 'a', 'b', '1', '6', '2', 'i', 'j', '3', '4', '5', 'j', '7'])
       self.assertEqual( l.pop(), '7' )
       self.assertEqual( l.pop(3), '1' )
       self.assertEqual( list(l), ['8', 'a', 'b', '6', '2', 'i', 'j', '3', '4', '5', 'j'] )

roottest/python/basic/PyROOT_datatypetest.py

@@ -38,14 +38,10 @@ def setup_class(cls):
         cls.test_dct = "DataTypes_C"
         cls.datatypes = cppyy.load_reflection_info(cls.test_dct)
         cls.N = cppyy.gbl.N
-        cls.legacy_pyroot = os.environ.get('LEGACY_PYROOT') == 'True'
-        if not cls.legacy_pyroot:
-            # In new Cppyy, nullptr can't be found in gbl.
-            # Take it from libcppyy (we could also use ROOT.nullptr)
-            import libcppyy
-            cls.nullptr = libcppyy.nullptr
-        else:
-            cls.nullptr = cppyy.gbl.nullptr
+        # In new Cppyy, nullptr can't be found in gbl.
+        # Take it from libcppyy (we could also use ROOT.nullptr)
+        import libcppyy
+        cls.nullptr = libcppyy.nullptr
 
     def test01_load_reflection_cache(self):
         """Loading reflection info twice should result in the same object"""
@@ -202,13 +198,9 @@ def test03_instance_data_write_access(self):
         c.set_uchar(45);  assert c.m_uchar     == chr(45)
 
         # limits and checks
-        if not self.legacy_pyroot:
-           # This throws ValueError in new Cppyy
-           raises(ValueError,  c.set_char, "string")
-           raises(ValueError,  c.set_uchar, "string")
-        else:
-           raises(TypeError,  c.set_char, "string")
-           raises(TypeError,  c.set_uchar, "string")
+        # This throws ValueError in new Cppyy
+        raises(ValueError,  c.set_char, "string")
+        raises(ValueError,  c.set_uchar, "string")
         raises(ValueError, c.set_char, 500)
         raises(ValueError, c.set_uchar, -1)
         c.set_char_cr(-128); assert c.get_char()  == chr(0x80)
@@ -807,11 +799,8 @@ def test16_nullptr_passing(self):
 
         import cppyy
 
-        if not self.legacy_pyroot:
-            # New Cppyy does not allow conversion from None to null pointer anymore
-            t = (0, )
-        else:
-            t = (0, None)
+        # New Cppyy does not allow conversion from None to null pointer anymore
+        t = (0, )
         for o in t:
             c = cppyy.gbl.CppyyTestData()
             assert c.m_pod.m_int == 888
@@ -904,28 +893,14 @@ def test20_buffer_reshaping(self):
             if not PYTEST_MIGRATION:
                 arr = arr.shape.fromaddress(arr.itemaddress(0), self.N)
             if PYTEST_MIGRATION:
-                if not self.legacy_pyroot:
-                    # In new Cppyy, buffers have a reshape method
-                    arr.reshape((self.N,))
+                # In new Cppyy, buffers have a reshape method
+                arr.reshape((self.N,))
 
-                    assert len(arr) == self.N
+                assert len(arr) == self.N
 
-                    l = list(arr)
-                    for i in range(self.N):
-                        assert arr[i] == l[i]
-                else:
-                    arr.SetSize(self.N)
-                    # Test forward compatibility
-                    arr2 = getattr(c, func)()
-                    arr2.reshape((self.N,))
-
-                    for a in arr,arr2:
-
-                        assert len(a) == self.N
-
-                        l = list(a)
-                        for i in range(self.N):
-                            assert a[i] == l[i]
+                l = list(arr)
+                for i in range(self.N):
+                    assert arr[i] == l[i]
 
     def test21_voidp(self):
         """Use of void* data"""
@@ -973,11 +948,8 @@ def address_equality_test(a, b):
         def null_test(null):
             c.m_voidp = null
             assert c.m_voidp is self.nullptr
-        if not self.legacy_pyroot:
-            # New Cppyy does not allow assignment of pointer type to None
-            null_list = [0, self.nullptr]
-        else:
-            null_list = [0, None, self.nullptr]
+        # New Cppyy does not allow assignment of pointer type to None
+        null_list = [0, self.nullptr]
         map(null_test, null_list)
 
         c.m_voidp = c2

roottest/python/basic/PyROOT_overloadtests.py

@@ -32,7 +32,6 @@ def setup_class(cls):
         import cppyy
         cls.test_dct = "Overloads_C"
         cls.datatypes = cppyy.load_reflection_info(cls.test_dct)
-        cls.legacy_pyroot = os.environ.get('LEGACY_PYROOT') == 'True'
 
     def test01_class_based_overloads(self):
         """Functions overloaded on different C++ class arguments"""
@@ -103,21 +102,13 @@ def test03_fragile_class_based_overloads(self):
         from cppyy.gbl import get_OlBB, get_OlDD
 
         # first verify that BB and DD are indeed unknown
-        if not self.legacy_pyroot:
-            # In new Cppyy, this raises a TypeError
-            raises(TypeError, OlBB)
-            raises(TypeError, OlDD)
-        else:
-            raises(RuntimeError, OlBB)
-            raises(RuntimeError, OlDD)
+        raises(TypeError, OlBB)
+        raises(TypeError, OlDD)
 
         # then try overloads based on them
         assert MoreOverloads().call(OlAA())     == "OlAA"
-        if not self.legacy_pyroot:
-            # New Cppyy calls the same overload as C++: (const OlBB&, void*)
-            get_olbb_res = "OlBB"
-        else:
-            get_olbb_res = "OlDD"   # <- has an unknown + void*
+        # New Cppyy calls the same overload as C++: (const OlBB&, void*)
+        get_olbb_res = "OlBB"
         assert MoreOverloads().call(get_OlBB()) == get_olbb_res
         assert MoreOverloads().call(OlCC())     == "OlCC"
         assert MoreOverloads().call(get_OlDD()) == "OlDD"   # <- has an unknown

roottest/python/cling/CMakeLists.txt

@@ -1,9 +1,5 @@
 if(ROOT_pyroot_FOUND)
-  if (ROOT_pyroot_legacy_FOUND)
-    set(api_macro_file runPyAPITest.C)
-  else()
-    set(api_macro_file runPyAPITestCppyy.C) # Uses new Cppyy API
-  endif()
+  set(api_macro_file runPyAPITestCppyy.C) # Uses new Cppyy API
   ROOTTEST_ADD_TEST(api
                     MACRO ${api_macro_file}
                     WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}

roottest/python/cling/runPyAPITest.C

@@ -5,21 +5,18 @@ if(NOT MSVC OR win_broken_tests)
                     COPY_TO_BUILDDIR Namespace.C PointerPassing.C  Namespace2.C
                     PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ Namespace.C+
                                          -e .L\ PointerPassing.C+
-                                         -e .L\ Namespace2.C+
-                    ENVIRONMENT LEGACY_PYROOT=${legacy_pyroot})
+                                         -e .L\ Namespace2.C+)
 
   ROOTTEST_ADD_TEST(advanced
                     MACRO PyROOT_advancedtests.py
                     COPY_TO_BUILDDIR AdvancedCpp.C Template.C
                     PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ AdvancedCpp.C+
-                                                     -e .L\ Template.C+
-                    ENVIRONMENT LEGACY_PYROOT=${legacy_pyroot})
+                                                     -e .L\ Template.C+)
 endif()
 
   ROOTTEST_ADD_TEST(cpp11
                     MACRO PyROOT_cpp11tests.py
                     COPY_TO_BUILDDIR Cpp11Features.C
-                    PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ Cpp11Features.C+
-                    ENVIRONMENT LEGACY_PYROOT=${legacy_pyroot})
+                    PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ Cpp11Features.C+)
 
 endif()