Refactor tests

Author: Zac-HD

hypothesis-python/tests/cover/test_control.py

@@ -74,7 +74,7 @@ def test_does_not_suppress_exceptions():
 
 
 def test_suppresses_exceptions_in_teardown():
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError) as exc_info:
         with bc():
 
             def foo():
@@ -83,12 +83,12 @@ def foo():
             cleanup(foo)
             raise AssertionError
 
-    assert isinstance(err.value, ValueError)
-    assert isinstance(err.value.__cause__, AssertionError)
+    assert isinstance(exc_info.value, ValueError)
+    assert isinstance(exc_info.value.__cause__, AssertionError)
 
 
 def test_runs_multiple_cleanup_with_teardown():
-    with pytest.raises(ExceptionGroup) as err:
+    with pytest.raises(ExceptionGroup) as exc_info:
         with bc():
 
             def foo():
@@ -101,9 +101,9 @@ def bar():
             cleanup(bar)
             raise AssertionError
 
-    assert isinstance(err.value, ExceptionGroup)
-    assert isinstance(err.value.__cause__, AssertionError)
-    assert {type(e) for e in err.value.exceptions} == {ValueError, TypeError}
+    assert isinstance(exc_info.value, ExceptionGroup)
+    assert isinstance(exc_info.value.__cause__, AssertionError)
+    assert {type(e) for e in exc_info.value.exceptions} == {ValueError, TypeError}
     assert _current_build_context.value is None
 
 

hypothesis-python/tests/nocover/test_interesting_origin.py

@@ -58,9 +58,5 @@ def test_fn(x, y):
         # Indirection to fix https://github.com/HypothesisWorks/hypothesis/issues/2888
         return function(x, y)
 
-    try:
+    with pytest.raises(MultipleFailures):
         test_fn()
-    except MultipleFailures:
-        pass
-    else:
-        raise AssertionError("Expected MultipleFailures")

hypothesis-python/tests/nocover/test_targeting.py

@@ -29,7 +29,7 @@ def test_threshold_problem(x):
 @pytest.mark.parametrize("multiple", [False, True])
 def test_reports_target_results(testdir, multiple):
     script = testdir.makepyfile(TESTSUITE.format("" if multiple else "# "))
-    result = testdir.runpytest(script)
+    result = testdir.runpytest(script, "--tb=native")
     out = "\n".join(result.stdout.lines)
     assert "Falsifying example" in out
     assert "x=101" in out