switch tests to use raises

DeltaRCM · Jun 6, 2020 · 70bda53 · 70bda53
1 parent 1ca1cde
commit 70bda53
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/tests/test_initialization.py b/tests/test_initialization.py
@@ -22,9 +22,9 @@ def test_override_from_testfile(test_DeltaModel):
     assert test_DeltaModel.Length == 10
 
 
-@pytest.mark.xfail(raises=FileNotFoundError, strict=True)
 def test_error_if_no_file_found():
-    delta = DeltaModel(input_file='./nonexisting_file.yaml')
+    with pytest.raises(FileNotFoundError):
+        delta = DeltaModel(input_file='./nonexisting_file.yaml')
 
 
 def test_override_single_default(tmp_path):
@@ -49,24 +49,24 @@ def test_override_two_defaults(tmp_path):
     assert delta.Np_sed == 2
 
 
-@pytest.mark.xfail(raises=TypeError, strict=True)
 def test_override_bad_type_float_string(tmp_path):
     file_name = 'user_parameters.yaml'
     p, f = utilities.create_temporary_file(tmp_path, file_name)
     utilities.write_parameter_to_file(f, 'out_dir', tmp_path / 'out_dir')
     utilities.write_parameter_to_file(f, 'S0', 'a string?!')
     f.close()
-    delta = DeltaModel(input_file=p)
+    with pytest.raises(TypeError):
+        delta = DeltaModel(input_file=p)
 
 
-@pytest.mark.xfail(raises=TypeError, strict=True)
 def test_override_bad_type_int_float(tmp_path):
     file_name = 'user_parameters.yaml'
     p, f = utilities.create_temporary_file(tmp_path, file_name)
     utilities.write_parameter_to_file(f, 'out_dir', tmp_path / 'out_dir')
     utilities.write_parameter_to_file(f, 'beta', 24.4234)
     f.close()
-    delta = DeltaModel(input_file=p)
+    with pytest.raises(TypeError):
+        delta = DeltaModel(input_file=p)
 
 
 def test_not_creating_illegal_attributes(tmp_path):
@@ -221,14 +221,14 @@ def test_entry_point_python_main_call_timesteps(tmp_path):
     assert os.path.isfile(exp_path_png)
 
 
-@pytest.mark.xfail(raises=subprocess.CalledProcessError, strict=True)
 def test_error_if_no_timesteps(tmp_path):
     file_name = 'user_parameters.yaml'
     p, f = utilities.create_temporary_file(tmp_path, file_name)
     utilities.write_parameter_to_file(f, 'out_dir', tmp_path / 'test')
     f.close()
-    subprocess.check_output(['python', '-m', 'pyDeltaRCM',
-                             '--config', p])
+    with pytest.raises(subprocess.CalledProcessError):
+        subprocess.check_output(['python', '-m', 'pyDeltaRCM',
+                                 '--config', p])
 
 
 import pyDeltaRCM as _pyimportedalias
@@ -250,18 +250,18 @@ def test_version_call():
 from pyDeltaRCM import preprocessor
 
 
-@pytest.mark.xfail(raises=ValueError, strict=True)
 def test_python_highlevelapi_call_without_args():
-    pp = preprocessor.Preprocessor()
+    with pytest.raises(ValueError):
+        pp = preprocessor.Preprocessor()
 
 
-@pytest.mark.xfail(raises=ValueError, strict=True)
 def test_python_highlevelapi_call_without_timesteps(tmp_path):
     file_name = 'user_parameters.yaml'
     p, f = utilities.create_temporary_file(tmp_path, file_name)
     utilities.write_parameter_to_file(f, 'out_dir', tmp_path / 'test')
     f.close()
-    pp = preprocessor.Preprocessor(p)
+    with pytest.raises(ValueError):
+        pp = preprocessor.Preprocessor(p)
 
 
 def test_python_highlevelapi_call_with_args(tmp_path):

diff --git a/tests/test_model.py b/tests/test_model.py
@@ -31,7 +31,6 @@ def test_finalize(test_DeltaModel):
     assert test_DeltaModel._is_finalized == True
 
 
-# @pytest.mark.xfail(raises=RuntimeError, strict=True)
 def test_multifinalization_error(test_DeltaModel):
     err_delta = test_DeltaModel
     err_delta.update()

diff --git a/tests/test_water_tools.py b/tests/test_water_tools.py
@@ -80,5 +80,3 @@ def test_calculate_new_ind(test_DeltaModel):
                                               test_DeltaModel.jwalk.flatten(),
                                               test_DeltaModel.eta.shape)
     assert np.all(new_inds == np.array([14, 15]))
-
-    # assert test_DeltaModel.calculate_new_ind(old_ind, new_cell) == 14