TEST: Fix tests broken in the rebase

Author: effigies

nibabel/tests/test_minc1.py

@@ -112,7 +112,7 @@ def test_old_namespace():
         MincImage(arr, aff)
     # Another old name
     from ..minc1 import MincFile, Minc1File
-    assert_false(MincFile is Minc1File)
+    assert MincFile is not Minc1File
     with pytest.raises(ExpiredDeprecationError):
         mf = MincFile(netcdf_file(EG_FNAME))
 

nibabel/tests/test_processing.py

@@ -172,7 +172,8 @@ def test_resample_from_to():
     assert out.__class__ == Nifti1Image
     # From 2D to 3D, error, the fixed affine is not invertible
     img_2d = Nifti1Image(data[:, :, 0], affine)
-    assert_raises(AffineError, resample_from_to, img_2d, img)
+    with pytest.raises(AffineError):
+        resample_from_to(img_2d, img)
     # 3D to 2D, we don't need to invert the fixed matrix
     out = resample_from_to(img, img_2d)
     assert_array_equal(out.dataobj, data[:, :, 0])
@@ -186,7 +187,7 @@ def test_resample_from_to():
     assert_almost_equal(data_4d, out.dataobj)
     assert_array_equal(img_4d.affine, out.affine)
     # Errors trying to match 3D to 4D
-    with pytest.rises(ValueError):
+    with pytest.raises(ValueError):
         resample_from_to(img_4d, img)
     with pytest.raises(ValueError):
         resample_from_to(img, img_4d)

nibabel/tests/test_scaling.py

@@ -149,7 +149,7 @@ def test_array_file_scales(in_type, out_type, err):
     arr[0], arr[1] = info['min'], info['max']
     if not err is None:
         with pytest.raises(err):
-            _calculate_scale, arr, out_dtype, True)
+            _calculate_scale(arr, out_dtype, True)
         return
     slope, inter, mn, mx = _calculate_scale(arr, out_dtype, True)
     array_to_file(arr, bio, out_type, 0, inter, slope, mn, mx)