Update manipulation_tests/test_rearrange.py

Author: antonwolfy

dpnp/tests/third_party/cupy/manipulation_tests/test_rearrange.py

@@ -26,6 +26,7 @@
     {"shape": (5, 2), "shift": (2, 1, 3), "axis": None},
 )
 class TestRoll(unittest.TestCase):
+
     @testing.for_all_dtypes()
     @testing.numpy_cupy_array_equal()
     def test_roll(self, xp, dtype):
@@ -37,17 +38,26 @@ def test_roll(self, xp, dtype):
     def test_roll_cupy_shift(self, xp, dtype):
         x = testing.shaped_arange(self.shape, xp, dtype)
         shift = self.shift
+        if xp is cupy:
+            shift = cupy.array(shift)
         return xp.roll(x, shift, axis=self.axis)
 
 
 class TestRollTypeError(unittest.TestCase):
-    # TODO: update, once dpctl#1857 is resolved
-    @testing.with_requires("numpy<2.1.2")  # done in numpy#27437
+
+    @testing.with_requires("numpy>=2.1.2")
+    def test_roll_invalid_shift_castable(self):
+        for xp in (numpy, cupy):
+            x = testing.shaped_arange((5, 2), xp)
+            # Weird but works due to `int` call
+            xp.roll(x, "0", axis=0)
+
+    @testing.with_requires("numpy>=2.1.2")
     def test_roll_invalid_shift(self):
         for xp in (numpy, cupy):
             x = testing.shaped_arange((5, 2), xp)
-            with pytest.raises(TypeError):
-                xp.roll(x, "0", axis=0)
+            with pytest.raises(ValueError):
+                xp.roll(x, "a", axis=0)
 
     def test_roll_invalid_axis_type(self):
         for xp in (numpy, cupy):
@@ -75,11 +85,14 @@ def test_roll_invalid_cupy_shift(self):
         for xp in (numpy, cupy):
             x = testing.shaped_arange(self.shape, xp)
             shift = self.shift
+            if xp is cupy:
+                shift = cupy.array(shift)
             with pytest.raises(ValueError):
                 xp.roll(x, shift, axis=self.axis)
 
 
 class TestFliplr(unittest.TestCase):
+
     @testing.for_all_dtypes()
     @testing.numpy_cupy_array_equal()
     def test_fliplr_2(self, xp, dtype):
@@ -101,6 +114,7 @@ def test_fliplr_insufficient_ndim(self, dtype):
 
 
 class TestFlipud(unittest.TestCase):
+
     @testing.for_all_dtypes()
     @testing.numpy_cupy_array_equal()
     def test_flipud_1(self, xp, dtype):
@@ -122,6 +136,7 @@ def test_flipud_insufficient_ndim(self, dtype):
 
 
 class TestFlip(unittest.TestCase):
+
     @testing.for_all_dtypes()
     @testing.numpy_cupy_array_equal()
     def test_flip_1(self, xp, dtype):
@@ -205,6 +220,7 @@ def test_flip_invalid_negative_axis(self, dtype):
 
 
 class TestRot90(unittest.TestCase):
+
     @testing.for_all_dtypes()
     @testing.numpy_cupy_array_equal()
     def test_rot90_none(self, xp, dtype):