Refactor test code

Zac-HD · Zac-HD · commit e90e34dd2c91 · 2021-09-11T13:30:53.000+10:00
diff --git a/hypothesis-python/tests/array_api/test_from_dtype.py b/hypothesis-python/tests/array_api/test_from_dtype.py
@@ -86,11 +86,7 @@ def smoke_test(_):
         ),
         (xp.float32, {"allow_nan": False}, lambda x: not math.isnan(x)),
         (xp.float32, {"allow_infinity": False}, lambda x: not math.isinf(x)),
-        (
-            xp.float32,
-            {"allow_nan": False, "allow_infinity": False},
-            lambda x: not math.isnan(x) and not math.isinf(x),
-        ),
+        (xp.float32, {"allow_nan": False, "allow_infinity": False}, math.isfinite),
         # Integer bounds, limited to the representable range
         (xp.int8, {"min_value": -1, "max_value": 1}, lambda x: -1 <= x <= 1),
         (xp.uint8, {"min_value": 1, "max_value": 2}, lambda x: 1 <= x <= 2),
diff --git a/hypothesis-python/tests/array_api/test_indices.py b/hypothesis-python/tests/array_api/test_indices.py
@@ -25,20 +25,14 @@
 pytestmark = [pytest.mark.mockable_xp]
 
 
-@pytest.mark.parametrize(
-    "condition",
-    [
-        lambda ix: Ellipsis in ix,
-        lambda ix: Ellipsis not in ix,
-    ],
-)
-def test_indices_options(condition):
+def test_indices_options():
     indexers = (
         xps.array_shapes(min_dims=1, max_dims=32)
-        .flatmap(lambda shape: xps.indices(shape))
+        .flatmap(xps.indices)
         .map(lambda idx: idx if isinstance(idx, tuple) else (idx,))
     )
-    find_any(indexers, condition)
+    find_any(indexers, lambda ix: Ellipsis in ix)
+    find_any(indexers, lambda ix: Ellipsis not in ix)
 
 
 def test_indices_can_generate_empty_tuple():
diff --git a/hypothesis-python/tests/array_api/test_pretty.py b/hypothesis-python/tests/array_api/test_pretty.py
@@ -72,6 +72,6 @@ def test_namespaced_methods_meta(name):
 )
 def test_namespaced_strategies_repr(name, strat):
     """Namespaced strategies have good repr."""
-    assert repr(strat).startswith(name), f"{name} not in strat repr"
+    assert repr(strat).startswith(name + "("), f"{name} not in strat repr {strat!r}"
     assert len(repr(strat)) < 100, "strat repr looks too long"
     assert xp.__name__ not in repr(strat), f"{xp.__name__} in strat repr"

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,6 @@ def test_namespaced_methods_meta(name):`
`72`	`72`	`)`
`73`	`73`	`def test_namespaced_strategies_repr(name, strat):`
`74`	`74`	`"""Namespaced strategies have good repr."""`
`75`		`- assert repr(strat).startswith(name), f"{name} not in strat repr"`
	`75`	`+ assert repr(strat).startswith(name + "("), f"{name} not in strat repr {strat!r}"`
`76`	`76`	`assert len(repr(strat)) < 100, "strat repr looks too long"`
`77`	`77`	`assert xp.__name__ not in repr(strat), f"{xp.__name__} in strat repr"`