remove warning-compensatory changes to test suite

hypothesis-python/tests/common/utils.py

@@ -10,7 +10,6 @@
 
 import contextlib
 import sys
-import warnings
 from io import StringIO
 from types import SimpleNamespace
 
@@ -86,16 +85,6 @@ def capture_out():
         sys.stdout = old_out
 
 
-class catch_sampled_from_strategies_warning(warnings.catch_warnings):
-    def __enter__(self):
-        warnings.filterwarnings(
-            action="ignore",
-            message="sample_from was given a collection of strategies; was one_of intended?",
-            category=UserWarning,
-        )
-        super().__enter__()
-
-
 class ExcInfo:
     pass
 

hypothesis-python/tests/cover/test_lookup.py

@@ -42,11 +42,7 @@
     find_any,
     minimal,
 )
-from tests.common.utils import (
-    catch_sampled_from_strategies_warning,
-    fails_with,
-    temp_registered,
-)
+from tests.common.utils import fails_with, temp_registered
 
 sentinel = object()
 BUILTIN_TYPES = tuple(
@@ -319,24 +315,19 @@ class Baz(Foo):
     [
         # Expect a warning exactly when the type constraint/bound should trigger
         # passing a strategy to sampled_from.
-        (typing.TypeVar("V"), object, False),
-        (typing.TypeVar("V", bound=int), int, False),
-        (typing.TypeVar("V", bound=Foo), (Bar, Baz), True),
-        (typing.TypeVar("V", bound=typing.Union[int, str]), (int, str), True),
-        (typing.TypeVar("V", int, str), (int, str), False),
+        (typing.TypeVar("V"), object),
+        (typing.TypeVar("V", bound=int), int),
+        (typing.TypeVar("V", bound=Foo), (Bar, Baz)),
+        (typing.TypeVar("V", bound=typing.Union[int, str]), (int, str)),
+        (typing.TypeVar("V", int, str), (int, str)),
     ],
 )
 @settings(suppress_health_check=[HealthCheck.too_slow])
 @given(data=st.data())
-def test_typevar_type_is_consistent(data, var, expected, exp_warn):
+def test_typevar_type_is_consistent(data, var, expected):
     strat = st.from_type(var)
-    if exp_warn:
-        with catch_sampled_from_strategies_warning():
-            v1 = data.draw(strat)
-            v2 = data.draw(strat)
-    else:
-        v1 = data.draw(strat)
-        v2 = data.draw(strat)
+    v1 = data.draw(strat)
+    v2 = data.draw(strat)
     assume(v1 != v2)  # Values may vary, just not types
     assert type(v1) == type(v2)
     assert isinstance(v1, expected)

hypothesis-python/tests/nocover/test_pretty_repr.py

@@ -16,8 +16,6 @@
 from hypothesis.control import reject
 from hypothesis.errors import HypothesisDeprecationWarning, InvalidArgument
 
-from tests.common.utils import catch_sampled_from_strategies_warning
-
 
 def foo(x):
     pass
@@ -53,39 +51,39 @@ def splat(value):
 
 values = st.integers() | st.text()
 
-with catch_sampled_from_strategies_warning():
-    Strategies = st.recursive(
-        st.one_of(
-            st.sampled_from(
-                [
-                    st.none(),
-                    st.booleans(),
-                    st.randoms(use_true_random=True),
-                    st.complex_numbers(),
-                    st.randoms(use_true_random=True),
-                    st.fractions(),
-                    st.decimals(),
-                ]
-            ),
-            st.builds(st.just, values),
-            st.builds(st.sampled_from, st.lists(values, min_size=1)),
-            builds_ignoring_invalid(st.floats, st.floats(), st.floats()),
+
+Strategies = st.recursive(
+    st.one_of(
+        st.sampled_from(
+            [
+                st.none(),
+                st.booleans(),
+                st.randoms(use_true_random=True),
+                st.complex_numbers(),
+                st.randoms(use_true_random=True),
+                st.fractions(),
+                st.decimals(),
+            ]
         ),
-        lambda x: st.one_of(
-            builds_ignoring_invalid(st.lists, x, **size_strategies),
-            builds_ignoring_invalid(st.sets, x, **size_strategies),
-            builds_ignoring_invalid(lambda v: st.tuples(*v), st.lists(x)),
-            builds_ignoring_invalid(lambda v: st.one_of(*v), st.lists(x, min_size=1)),
-            builds_ignoring_invalid(
-                st.dictionaries,
-                x,
-                x,
-                dict_class=st.sampled_from([dict, OrderedDict]),
-                **size_strategies,
-            ),
-            st.builds(lambda s, f: s.map(f), x, st.sampled_from(fns)),
+        st.builds(st.just, values),
+        st.builds(st.sampled_from, st.lists(values, min_size=1)),
+        builds_ignoring_invalid(st.floats, st.floats(), st.floats()),
+    ),
+    lambda x: st.one_of(
+        builds_ignoring_invalid(st.lists, x, **size_strategies),
+        builds_ignoring_invalid(st.sets, x, **size_strategies),
+        builds_ignoring_invalid(lambda v: st.tuples(*v), st.lists(x)),
+        builds_ignoring_invalid(lambda v: st.one_of(*v), st.lists(x, min_size=1)),
+        builds_ignoring_invalid(
+            st.dictionaries,
+            x,
+            x,
+            dict_class=st.sampled_from([dict, OrderedDict]),
+            **size_strategies,
         ),
-    )
+        st.builds(lambda s, f: s.map(f), x, st.sampled_from(fns)),
+    ),
+)
 
 
 strategy_globals = {k: getattr(st, k) for k in dir(st)}

hypothesis-python/tests/nocover/test_reusable_values.py

@@ -13,8 +13,6 @@
 from hypothesis import example, given, strategies as st
 from hypothesis.errors import InvalidArgument
 
-from tests.common.utils import catch_sampled_from_strategies_warning
-
 # Be aware that tests in this file pass strategies as arguments to @example.
 # That's normally a mistake, but for these tests it's intended.
 # If one of these tests fails, Hypothesis will complain about the
@@ -47,25 +45,24 @@
 def reusable():
     """Meta-strategy that produces strategies that should have
     ``.has_reusable_values == True``."""
-    with catch_sampled_from_strategies_warning():
-        return st.one_of(
-            # This looks like it should be `one_of`, but `sampled_from` is correct
-            # because we want this meta-strategy to yield strategies as its values.
-            st.sampled_from(base_reusable_strategies),
-            # This sometimes produces invalid combinations of arguments, which
-            # we filter out further down with an explicit validation check.
-            st.builds(
-                st.floats,
-                min_value=st.none() | st.floats(allow_nan=False),
-                max_value=st.none() | st.floats(allow_nan=False),
-                allow_infinity=st.booleans(),
-                allow_nan=st.booleans(),
-            ),
-            st.builds(st.just, st.builds(list)),
-            st.builds(st.sampled_from, st.lists(st.builds(list), min_size=1)),
-            st.lists(reusable).map(st.one_of),
-            st.lists(reusable).map(lambda ls: st.tuples(*ls)),
-        )
+    return st.one_of(
+        # This looks like it should be `one_of`, but `sampled_from` is correct
+        # because we want this meta-strategy to yield strategies as its values.
+        st.sampled_from(base_reusable_strategies),
+        # This sometimes produces invalid combinations of arguments, which
+        # we filter out further down with an explicit validation check.
+        st.builds(
+            st.floats,
+            min_value=st.none() | st.floats(allow_nan=False),
+            max_value=st.none() | st.floats(allow_nan=False),
+            allow_infinity=st.booleans(),
+            allow_nan=st.booleans(),
+        ),
+        st.builds(st.just, st.builds(list)),
+        st.builds(st.sampled_from, st.lists(st.builds(list), min_size=1)),
+        st.lists(reusable).map(st.one_of),
+        st.lists(reusable).map(lambda ls: st.tuples(*ls)),
+    )
 
 
 def is_valid(s):

hypothesis-python/tests/nocover/test_strategy_state.py

@@ -34,8 +34,6 @@
     tuples,
 )
 
-from tests.common.utils import catch_sampled_from_strategies_warning
-
 AVERAGE_LIST_LENGTH = 2
 
 
@@ -185,8 +183,7 @@ def repr_is_good(self, strat):
 
 MAIN = __name__ == "__main__"
 
-with catch_sampled_from_strategies_warning():
-    TestHypothesis = HypothesisSpec.TestCase
+TestHypothesis = HypothesisSpec.TestCase
 
 TestHypothesis.settings = settings(
     TestHypothesis.settings,
@@ -196,5 +193,4 @@ def repr_is_good(self, strat):
 )
 
 if MAIN:
-    with catch_sampled_from_strategies_warning():
-        TestHypothesis().runTest()
+    TestHypothesis().runTest()