Fix incorrect merge conflict resolution

Author: asmeurer

array_api_strict/_array_object.py

@@ -160,8 +160,8 @@ def __array__(self, dtype: None | np.dtype[Any] = None, copy: None | bool = None
         # We have to allow this to be internally enabled as there's no other
         # easy way to parse a list of Array objects in asarray().
         if _allow_array:
-        if self._device != CPU_DEVICE:
-            raise RuntimeError(f"Can not convert array on the '{self._device}' device to a Numpy array.")
+            if self._device != CPU_DEVICE:
+                raise RuntimeError(f"Can not convert array on the '{self._device}' device to a Numpy array.")
             # copy keyword is new in 2.0.0; for older versions don't use it
             # retry without that keyword.
             if np.__version__[0] < '2':

array_api_strict/tests/test_array_object.py

@@ -353,14 +353,17 @@ def test_array_properties():
 
 def test_array_conversion():
     # Check that arrays on the CPU device can be converted to NumPy
-    # but arrays on other devices can't
+    # but arrays on other devices can't. Note this is testing the logic in
+    # __array__, which is only used in asarray when converting lists of
+    # arrays.
     a = ones((2, 3))
-    np.asarray(a)
+    asarray([a])
 
     for device in ("device1", "device2"):
         a = ones((2, 3), device=array_api_strict.Device(device))
         with pytest.raises(RuntimeError, match="Can not convert array"):
-            np.asarray(a)
+            asarray([a])
+
 def test_allow_newaxis():
     a = ones(5)
     indexed_a = a[None, :]