Refactor tests to pass new Hypothesis healthcheck for differing executors

This may have been the source of intermittent failures related to random bytes
generation.

Author: ihnorton

tiledb/tests/test_hypothesis.py

@@ -7,56 +7,53 @@
 
 import tiledb
 
-from .common import DiskTestCase
-
 pd = pytest.importorskip("pandas")
 tm = pd._testing
 
 
-class AttrDataTest(DiskTestCase):
-    @hp.settings(deadline=None, verbosity=hp.Verbosity.verbose)
-    @hp.given(st.binary())
-    @pytest.mark.parametrize("mode", ["np", "df"])
-    def test_bytes_npdf(self, mode, data):
-        start = time.time()
+@pytest.mark.parametrize("mode", ["np", "df"])
+@hp.settings(deadline=None, verbosity=hp.Verbosity.verbose)
+@hp.given(st.binary())
+def test_bytes_npdf(checked_path, mode, data):
+    start = time.time()
+
+    uri = "mem://" + checked_path.path()
+    hp.note(f"!!! path '{uri}' time: {time.time() - start}")
+
+    array = np.array([data], dtype="S0")
+
+    start_ingest = time.time()
+    if mode == "np":
+        with tiledb.from_numpy(uri, array) as A:
+            pass
+    else:
+        series = pd.Series(array)
+        df = pd.DataFrame({"": series})
+        # NOTE: ctx required here for mem://
+        tiledb.from_pandas(uri, df, sparse=False, ctx=tiledb.default_ctx())
 
-        uri = "mem://" + self.path()
-        hp.note(f"!!! self.path() '{uri}' time: {time.time() - start}")
+    hp.note(f"{mode} ingest time: {time.time() - start_ingest}")
 
-        array = np.array([data], dtype="S0")
+    # DEBUG
+    tiledb.stats_enable()
+    tiledb.stats_reset()
+    # END DEBUG
 
-        start_ingest = time.time()
+    with tiledb.open(uri) as A:
         if mode == "np":
-            with tiledb.from_numpy(uri, array) as A:
-                pass
+            np.testing.assert_array_equal(A.multi_index[:][""], array)
         else:
-            series = pd.Series(array)
-            df = pd.DataFrame({"": series})
-            # NOTE: ctx required here for mem://
-            tiledb.from_pandas(uri, df, sparse=False, ctx=tiledb.default_ctx())
-
-        hp.note(f"{mode} ingest time: {time.time() - start_ingest}")
-
-        # DEBUG
-        tiledb.stats_enable()
-        tiledb.stats_reset()
-        # END DEBUG
-
-        with tiledb.open(uri) as A:
-            if mode == "np":
-                np.testing.assert_array_equal(A.multi_index[:][""], array)
-            else:
-                tm.assert_frame_equal(A.df[:], df)
-
-        hp.note(tiledb.stats_dump(print_out=False))
-
-        # DEBUG
-        tiledb.stats_disable()
-
-        duration = time.time() - start
-        hp.note(f"!!! test_bytes_{mode} duration: {duration}")
-        if duration > 2:
-            # Hypothesis setup is (maybe) causing deadline exceeded errors
-            # https://github.com/TileDB-Inc/TileDB-Py/issues/1194
-            # Set deadline=None and use internal timing instead.
-            pytest.fail(f"!!! {mode} function body duration exceeded 2s: {duration}")
+            tm.assert_frame_equal(A.df[:], df)
+
+    hp.note(tiledb.stats_dump(print_out=False))
+
+    # DEBUG
+    tiledb.stats_disable()
+
+    duration = time.time() - start
+    hp.note(f"!!! test_bytes_{mode} duration: {duration}")
+    if duration > 2:
+        # Hypothesis setup is (maybe) causing deadline exceeded errors
+        # https://github.com/TileDB-Inc/TileDB-Py/issues/1194
+        # Set deadline=None and use internal timing instead.
+        pytest.fail(f"!!! {mode} function body duration exceeded 2s: {duration}")

tiledb/tests/test_multi_index-hp.py

@@ -81,9 +81,11 @@ def create_array(uri):
 
         return uri
 
-    @pytest.mark.parametrize("order", ["C", "F", "U"])
-    @given(st.lists(bounded_ntuple(length=2, min_value=-100, max_value=100)))
-    def test_multi_index_two_way_query(self, order, sparse_array_1d, ranges):
+    @given(
+        order=st.sampled_from(["C", "F", "U"]),
+        ranges=st.lists(bounded_ntuple(length=2, min_value=-100, max_value=100)),
+    )
+    def test_multi_index_two_way_query(self, order, ranges, sparse_array_1d):
         """This test checks the result of "direct" range queries using PyQuery
         against the result of `multi_index` on the same ranges."""