Merge pull request #4503 from jobh/test-annoyances

Test annoyances

Author: jobh

hypothesis-python/tests/cover/test_database_backend.py

@@ -477,14 +477,19 @@ def test_database_directory_inaccessible(dirs, tmp_path, monkeypatch):
     monkeypatch.setattr(
         configuration, "__hypothesis_home_directory", tmp_path.joinpath(*dirs)
     )
-    tmp_path.chmod(0o000)
-    with (
-        nullcontext()
-        if WINDOWS
-        else pytest.warns(HypothesisWarning, match=".*the default location is unusable")
-    ):
-        database = _db_for_path(not_set)
-    database.save(b"fizz", b"buzz")
+    try:
+        tmp_path.chmod(0o000)
+        with (
+            nullcontext()
+            if WINDOWS
+            else pytest.warns(
+                HypothesisWarning, match=".*the default location is unusable"
+            )
+        ):
+            database = _db_for_path(not_set)
+        database.save(b"fizz", b"buzz")
+    finally:
+        tmp_path.chmod(0o600)  # So that pytest can clean up tmp_path later
 
 
 @skipif_emscripten

hypothesis-python/tests/cover/test_traceback_elision.py

@@ -16,7 +16,10 @@
 
 
 @pytest.mark.parametrize("verbosity", [Verbosity.normal, Verbosity.debug])
-def test_tracebacks_omit_hypothesis_internals(verbosity):
+@pytest.mark.parametrize("env_value", ["", "1"])
+def test_tracebacks_omit_hypothesis_internals(monkeypatch, env_value, verbosity):
+    monkeypatch.setenv("HYPOTHESIS_NO_TRACEBACK_TRIM", env_value)
+
     @settings(verbosity=verbosity)
     @given(st.just(False))
     def simplest_failure(x):
@@ -28,7 +31,7 @@ def simplest_failure(x):
         tb = traceback.extract_tb(e.__traceback__)
         # Unless in debug mode, Hypothesis adds 1 frame - the least possible!
         # (4 frames: this one, simplest_failure, internal frame, assert False)
-        if verbosity < Verbosity.debug:
+        if verbosity < Verbosity.debug and not env_value:
             assert len(tb) == 4
         else:
             assert len(tb) >= 5