fix: separate fixture timeouts from test timeouts (#233)

Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: William Easton <[email protected]>

Author: strawgate

key-value/key-value-aio/pyproject.toml

@@ -64,6 +64,7 @@ markers = [
     "skip_on_ci: Skip running the test when running on CI",
 ]
 timeout = 10
+timeout_func_only = true
 
 env_files = [".env"]
 

key-value/key-value-aio/tests/stores/base.py

@@ -30,7 +30,6 @@ async def eventually_consistent(self) -> None:  # noqa: B027
     @abstractmethod
     async def store(self) -> BaseStore | AsyncGenerator[BaseStore, None]: ...
 
-    @pytest.mark.timeout(60)
     async def test_store(self, store: BaseStore):
         """Tests that the store is a valid AsyncKeyValueProtocol."""
         assert isinstance(store, AsyncKeyValueProtocol) is True
@@ -181,7 +180,6 @@ async def test_negative_ttl(self, store: BaseStore):
         with pytest.raises(InvalidTTLError):
             await store.put(collection="test", key="test", value={"test": "test"}, ttl=-100)
 
-    @pytest.mark.timeout(10)
     async def test_put_expired_get_none(self, store: BaseStore):
         """Tests that a put call with a negative ttl will return None when getting the key."""
         await store.put(collection="test_collection", key="test_key", value={"test": "test"}, ttl=2)
@@ -216,7 +214,6 @@ async def test_special_characters_in_key_name(self, store: BaseStore):
         await store.put(collection="test_collection", key="test_key!@#$%^&*()", value={"test": "test"})
         assert await store.get(collection="test_collection", key="test_key!@#$%^&*()") == {"test": "test"}
 
-    @pytest.mark.timeout(20)
     async def test_not_unbounded(self, store: BaseStore):
         """Tests that the store is not unbounded."""
 
@@ -246,15 +243,13 @@ async def worker(store: BaseStore, worker_id: int):
 
         _ = await async_gather(*[worker(store, worker_id) for worker_id in range(5)])
 
-    @pytest.mark.timeout(15)
     async def test_minimum_put_many_get_many_performance(self, store: BaseStore):
         """Tests that the store meets minimum performance requirements."""
         keys = [f"test_{i}" for i in range(10)]
         values = [{"test": f"test_{i}"} for i in range(10)]
         await store.put_many(collection="test_collection", keys=keys, values=values)
         assert await store.get_many(collection="test_collection", keys=keys) == values
 
-    @pytest.mark.timeout(15)
     async def test_minimum_put_many_delete_many_performance(self, store: BaseStore):
         """Tests that the store meets minimum performance requirements."""
         keys = [f"test_{i}" for i in range(10)]

key-value/key-value-sync/pyproject.toml

@@ -63,6 +63,7 @@ markers = [
     "skip_on_ci: Skip running the test when running on CI",
 ]
 timeout = 10
+timeout_func_only = true
 
 env_files = [".env"]
 

key-value/key-value-sync/tests/code_gen/stores/base.py

@@ -27,7 +27,6 @@ def eventually_consistent(self) -> None:  # noqa: B027
     @abstractmethod
     def store(self) -> BaseStore | Generator[BaseStore, None, None]: ...
 
-    @pytest.mark.timeout(60)
     def test_store(self, store: BaseStore):
         """Tests that the store is a valid KeyValueProtocol."""
         assert isinstance(store, KeyValueProtocol) is True
@@ -178,7 +177,6 @@ def test_negative_ttl(self, store: BaseStore):
         with pytest.raises(InvalidTTLError):
             store.put(collection="test", key="test", value={"test": "test"}, ttl=-100)
 
-    @pytest.mark.timeout(10)
     def test_put_expired_get_none(self, store: BaseStore):
         """Tests that a put call with a negative ttl will return None when getting the key."""
         store.put(collection="test_collection", key="test_key", value={"test": "test"}, ttl=2)
@@ -213,7 +211,6 @@ def test_special_characters_in_key_name(self, store: BaseStore):
         store.put(collection="test_collection", key="test_key!@#$%^&*()", value={"test": "test"})
         assert store.get(collection="test_collection", key="test_key!@#$%^&*()") == {"test": "test"}
 
-    @pytest.mark.timeout(20)
     def test_not_unbounded(self, store: BaseStore):
         """Tests that the store is not unbounded."""
 
@@ -243,15 +240,13 @@ def worker(store: BaseStore, worker_id: int):
 
         _ = gather(*[worker(store, worker_id) for worker_id in range(5)])
 
-    @pytest.mark.timeout(15)
     def test_minimum_put_many_get_many_performance(self, store: BaseStore):
         """Tests that the store meets minimum performance requirements."""
         keys = [f"test_{i}" for i in range(10)]
         values = [{"test": f"test_{i}"} for i in range(10)]
         store.put_many(collection="test_collection", keys=keys, values=values)
         assert store.get_many(collection="test_collection", keys=keys) == values
 
-    @pytest.mark.timeout(15)
     def test_minimum_put_many_delete_many_performance(self, store: BaseStore):
         """Tests that the store meets minimum performance requirements."""
         keys = [f"test_{i}" for i in range(10)]