Merge pull request #50 from elbeejay/pytest_raises

Swap xfail for pytest.raises
DeltaRCM · Jun 3, 2020 · a656db3 · a656db3
2 parents a7b6124 + 51b4b2c
commit a656db3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/tests/test_deltaRCM_driver.py b/tests/test_deltaRCM_driver.py
@@ -22,6 +22,7 @@ def test_init():
 
 def test_update():
     delta = pyDeltaRCM(input_file=os.path.join(os.getcwd(), 'tests', 'test.yaml'))
+
     delta.update()
     assert delta._time == 1.0
     assert delta._is_finalized == False
@@ -33,7 +34,6 @@ def test_finalize():
     assert delta._is_finalized == True
 
 
-@pytest.mark.xfail(raises=RuntimeError, strict=True)
 def test_multifinalization_error():
     err_delta = pyDeltaRCM(input_file=os.path.join(os.getcwd(), 'tests', 'test.yaml'))
     err_delta.update()
@@ -42,8 +42,9 @@ def test_multifinalization_error():
     assert err_delta._is_finalized == False
     err_delta.finalize()
     assert err_delta._is_finalized == True
-    # next line should throw RuntimeError and test will xFail
-    err_delta.update()
+    # next line should throw RuntimeError
+    with pytest.raises(RuntimeError):
+        err_delta.update()
 
 
 def test_getters_setters():

diff --git a/tests/test_shared_tools.py b/tests/test_shared_tools.py
@@ -160,10 +160,11 @@ def test_custom_unravel_rectangle():
     assert y == 4
 
 
-@pytest.mark.xfail(raises=IndexError, strict=True)
 def test_custom_unravel_exceed_error():
     arr = np.arange(9).reshape((3, 3))
-    x, y = shared_tools.custom_unravel(99, arr.shape)
+    # next line should throw IndexError
+    with pytest.raises(IndexError):
+        x, y = shared_tools.custom_unravel(99, arr.shape)
 
 
 def test_check_for_loops():

diff --git a/tests/test_yaml_parsing.py b/tests/test_yaml_parsing.py
@@ -35,9 +35,9 @@ def test_override_from_testfile():
     assert delta.Length == 10
 
 
-@pytest.mark.xfail(raises=FileNotFoundError, strict=True)
 def test_error_if_no_file_found():
-    delta = pyDeltaRCM(input_file='./nonexisting_file.yaml')
+    with pytest.raises(FileNotFoundError):
+        delta = pyDeltaRCM(input_file='./nonexisting_file.yaml')
 
 
 def test_override_single_default(tmp_path):
@@ -60,22 +60,22 @@ 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 = create_temporary_file(tmp_path, file_name)
     write_parameter_to_file(f, 'S0', 'a string?!')
     f.close()
-    delta = pyDeltaRCM(input_file=p)
+    with pytest.raises(TypeError):
+        delta = pyDeltaRCM(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 = create_temporary_file(tmp_path, file_name)
     write_parameter_to_file(f, 'beta', 24.4234)
     f.close()
-    delta = pyDeltaRCM(input_file=p)
+    with pytest.raises(TypeError):
+        delta = pyDeltaRCM(input_file=p)
 
 
 def test_not_creating_illegal_attributes(tmp_path):