Resolve pytest warnings

Author: vdusek

tests/integration/conftest.py

@@ -5,7 +5,7 @@
 import pytest
 from apify_shared.utils import create_hmac_signature, create_storage_content_signature
 
-from .utils import TestDataset, TestKvs, get_crypto_random_object_id
+from .utils import DatasetFixture, KvsFixture, get_crypto_random_object_id
 from apify_client import ApifyClient, ApifyClientAsync
 
 TOKEN_ENV_VAR = 'APIFY_TEST_USER_API_TOKEN'
@@ -46,7 +46,7 @@ def apify_client_async(api_token: str) -> ApifyClientAsync:
 
 
 @pytest.fixture(scope='session')
-def test_dataset_of_another_user(api_token_2: str) -> Generator[TestDataset]:
+def test_dataset_of_another_user(api_token_2: str) -> Generator[DatasetFixture]:
     """Pre-existing named dataset of another test user with restricted access."""
     client = ApifyClient(api_token_2, api_url=os.getenv(API_URL_ENV_VAR))
 
@@ -66,7 +66,7 @@ def test_dataset_of_another_user(api_token_2: str) -> Generator[TestDataset]:
         url_signing_secret_key=dataset.url_signing_secret_key,
     )
 
-    yield TestDataset(
+    yield DatasetFixture(
         id=dataset.id,
         signature=signature,
         expected_content=[{'item1': 1, 'item2': 2, 'item3': 3}, {'item1': 4, 'item2': 5, 'item3': 6}],
@@ -76,7 +76,7 @@ def test_dataset_of_another_user(api_token_2: str) -> Generator[TestDataset]:
 
 
 @pytest.fixture(scope='session')
-def test_kvs_of_another_user(api_token_2: str) -> Generator[TestKvs]:
+def test_kvs_of_another_user(api_token_2: str) -> Generator[KvsFixture]:
     """Pre-existing named key value store of another test user with restricted access."""
     client = ApifyClient(api_token_2, api_url=os.getenv(API_URL_ENV_VAR))
 
@@ -94,7 +94,7 @@ def test_kvs_of_another_user(api_token_2: str) -> Generator[TestKvs]:
         resource_id=kvs.id, url_signing_secret_key=kvs.url_signing_secret_key or ''
     )
 
-    yield TestKvs(
+    yield KvsFixture(
         id=kvs.id,
         signature=signature,
         expected_content=expected_content,

tests/integration/test_dataset.py

@@ -8,7 +8,7 @@
 import impit
 import pytest
 
-from .utils import TestDataset, get_random_resource_name, parametrized_api_urls
+from .utils import DatasetFixture, get_random_resource_name, parametrized_api_urls
 from apify_client import ApifyClient
 from apify_client._client import DEFAULT_API_URL
 from apify_client.errors import ApifyApiError
@@ -100,7 +100,7 @@ def test_public_url(api_token: str, api_url: str, api_public_url: str) -> None:
         )
 
 
-def test_list_items_signature(apify_client: ApifyClient, test_dataset_of_another_user: TestDataset) -> None:
+def test_list_items_signature(apify_client: ApifyClient, test_dataset_of_another_user: DatasetFixture) -> None:
     dataset = apify_client.dataset(dataset_id=test_dataset_of_another_user.id)
 
     # Permission error without valid signature
@@ -118,7 +118,7 @@ def test_list_items_signature(apify_client: ApifyClient, test_dataset_of_another
     )
 
 
-def test_iterate_items_signature(apify_client: ApifyClient, test_dataset_of_another_user: TestDataset) -> None:
+def test_iterate_items_signature(apify_client: ApifyClient, test_dataset_of_another_user: DatasetFixture) -> None:
     dataset = apify_client.dataset(dataset_id=test_dataset_of_another_user.id)
 
     # Permission error without valid signature
@@ -135,7 +135,7 @@ def test_iterate_items_signature(apify_client: ApifyClient, test_dataset_of_anot
     )
 
 
-def test_get_items_as_bytes_signature(apify_client: ApifyClient, test_dataset_of_another_user: TestDataset) -> None:
+def test_get_items_as_bytes_signature(apify_client: ApifyClient, test_dataset_of_another_user: DatasetFixture) -> None:
     dataset = apify_client.dataset(dataset_id=test_dataset_of_another_user.id)
 
     # Permission error without valid signature

tests/integration/test_dataset_async.py

@@ -8,7 +8,7 @@
 import impit
 import pytest
 
-from .utils import TestDataset, get_random_resource_name, parametrized_api_urls
+from .utils import DatasetFixture, get_random_resource_name, parametrized_api_urls
 from apify_client import ApifyClientAsync
 from apify_client._client import DEFAULT_API_URL
 from apify_client.errors import ApifyApiError
@@ -103,7 +103,7 @@ async def test_public_url(api_token: str, api_url: str, api_public_url: str) ->
 
 
 async def test_list_items_signature(
-    apify_client_async: ApifyClientAsync, test_dataset_of_another_user: TestDataset
+    apify_client_async: ApifyClientAsync, test_dataset_of_another_user: DatasetFixture
 ) -> None:
     dataset = apify_client_async.dataset(dataset_id=test_dataset_of_another_user.id)
 
@@ -123,7 +123,7 @@ async def test_list_items_signature(
 
 
 async def test_iterate_items_signature(
-    apify_client_async: ApifyClientAsync, test_dataset_of_another_user: TestDataset
+    apify_client_async: ApifyClientAsync, test_dataset_of_another_user: DatasetFixture
 ) -> None:
     dataset = apify_client_async.dataset(dataset_id=test_dataset_of_another_user.id)
 
@@ -142,7 +142,7 @@ async def test_iterate_items_signature(
 
 
 async def test_get_items_as_bytes_signature(
-    apify_client_async: ApifyClientAsync, test_dataset_of_another_user: TestDataset
+    apify_client_async: ApifyClientAsync, test_dataset_of_another_user: DatasetFixture
 ) -> None:
     dataset = apify_client_async.dataset(dataset_id=test_dataset_of_another_user.id)
 

tests/integration/test_key_value_store.py

@@ -9,7 +9,7 @@
 import pytest
 from apify_shared.utils import create_hmac_signature, create_storage_content_signature
 
-from .utils import TestKvs, get_random_resource_name, parametrized_api_urls
+from .utils import KvsFixture, get_random_resource_name, parametrized_api_urls
 from apify_client import ApifyClient
 from apify_client._client import DEFAULT_API_URL
 from apify_client.errors import ApifyApiError
@@ -131,7 +131,7 @@ def test_record_public_url(api_token: str, api_url: str, api_public_url: str, si
         )
 
 
-def test_list_keys_signature(apify_client: ApifyClient, test_kvs_of_another_user: TestKvs) -> None:
+def test_list_keys_signature(apify_client: ApifyClient, test_kvs_of_another_user: KvsFixture) -> None:
     kvs = apify_client.key_value_store(key_value_store_id=test_kvs_of_another_user.id)
 
     # Permission error without valid signature
@@ -149,7 +149,7 @@ def test_list_keys_signature(apify_client: ApifyClient, test_kvs_of_another_user
     assert set(test_kvs_of_another_user.expected_content) == {item.key for item in raw_items}
 
 
-def test_get_record_signature(apify_client: ApifyClient, test_kvs_of_another_user: TestKvs) -> None:
+def test_get_record_signature(apify_client: ApifyClient, test_kvs_of_another_user: KvsFixture) -> None:
     key = 'key1'
     kvs = apify_client.key_value_store(key_value_store_id=test_kvs_of_another_user.id)
 
@@ -167,7 +167,7 @@ def test_get_record_signature(apify_client: ApifyClient, test_kvs_of_another_use
     assert test_kvs_of_another_user.expected_content[key] == record['value']
 
 
-def test_get_record_as_bytes_signature(apify_client: ApifyClient, test_kvs_of_another_user: TestKvs) -> None:
+def test_get_record_as_bytes_signature(apify_client: ApifyClient, test_kvs_of_another_user: KvsFixture) -> None:
     key = 'key1'
     kvs = apify_client.key_value_store(key_value_store_id=test_kvs_of_another_user.id)
 
@@ -185,7 +185,7 @@ def test_get_record_as_bytes_signature(apify_client: ApifyClient, test_kvs_of_an
     assert test_kvs_of_another_user.expected_content[key] == json.loads(item['value'].decode('utf-8'))
 
 
-def test_stream_record_signature(apify_client: ApifyClient, test_kvs_of_another_user: TestKvs) -> None:
+def test_stream_record_signature(apify_client: ApifyClient, test_kvs_of_another_user: KvsFixture) -> None:
     key = 'key1'
     kvs = apify_client.key_value_store(key_value_store_id=test_kvs_of_another_user.id)
 

tests/integration/test_key_value_store_async.py

@@ -9,7 +9,7 @@
 import pytest
 from apify_shared.utils import create_hmac_signature, create_storage_content_signature
 
-from .utils import TestKvs, get_random_resource_name, parametrized_api_urls
+from .utils import KvsFixture, get_random_resource_name, parametrized_api_urls
 from apify_client import ApifyClientAsync
 from apify_client._client import DEFAULT_API_URL
 from apify_client.errors import ApifyApiError
@@ -137,7 +137,7 @@ async def test_record_public_url(api_token: str, api_url: str, api_public_url: s
         )
 
 
-async def test_list_keys_signature(apify_client_async: ApifyClientAsync, test_kvs_of_another_user: TestKvs) -> None:
+async def test_list_keys_signature(apify_client_async: ApifyClientAsync, test_kvs_of_another_user: KvsFixture) -> None:
     kvs = apify_client_async.key_value_store(key_value_store_id=test_kvs_of_another_user.id)
 
     # Permission error without valid signature
@@ -155,7 +155,7 @@ async def test_list_keys_signature(apify_client_async: ApifyClientAsync, test_kv
     assert set(test_kvs_of_another_user.expected_content) == {item.key for item in raw_items}
 
 
-async def test_get_record_signature(apify_client_async: ApifyClientAsync, test_kvs_of_another_user: TestKvs) -> None:
+async def test_get_record_signature(apify_client_async: ApifyClientAsync, test_kvs_of_another_user: KvsFixture) -> None:
     key = 'key1'
     kvs = apify_client_async.key_value_store(key_value_store_id=test_kvs_of_another_user.id)
 
@@ -174,7 +174,7 @@ async def test_get_record_signature(apify_client_async: ApifyClientAsync, test_k
 
 
 async def test_get_record_as_bytes_signature(
-    apify_client_async: ApifyClientAsync, test_kvs_of_another_user: TestKvs
+    apify_client_async: ApifyClientAsync, test_kvs_of_another_user: KvsFixture
 ) -> None:
     key = 'key1'
     kvs = apify_client_async.key_value_store(key_value_store_id=test_kvs_of_another_user.id)
@@ -193,7 +193,10 @@ async def test_get_record_as_bytes_signature(
     assert test_kvs_of_another_user.expected_content[key] == json.loads(item['value'].decode('utf-8'))
 
 
-async def test_stream_record_signature(apify_client_async: ApifyClientAsync, test_kvs_of_another_user: TestKvs) -> None:
+async def test_stream_record_signature(
+    apify_client_async: ApifyClientAsync,
+    test_kvs_of_another_user: KvsFixture,
+) -> None:
     key = 'key1'
     kvs = apify_client_async.key_value_store(key_value_store_id=test_kvs_of_another_user.id)
 

tests/integration/utils.py

@@ -7,23 +7,23 @@
 
 
 @dataclasses.dataclass
-class TestStorage:
-    """Test storage resource with ID and signature."""
+class StorageFixture:
+    """Storage resource fixture with ID and signature."""
 
     id: str
     signature: str
 
 
 @dataclasses.dataclass
-class TestDataset(TestStorage):
-    """Test dataset with expected content."""
+class DatasetFixture(StorageFixture):
+    """Dataset fixture with expected content."""
 
     expected_content: list
 
 
 @dataclasses.dataclass
-class TestKvs(TestStorage):
-    """Test key-value store with expected content and key signatures."""
+class KvsFixture(StorageFixture):
+    """Key-value store fixture with expected content and key signatures."""
 
     expected_content: dict[str, Any]
     keys_signature: dict[str, str]

tests/unit/test_client_timeouts.py

@@ -122,7 +122,6 @@ def mock_request(*_args: Any, **kwargs: Any) -> Response:
     (DatasetClient, 'update', dataset._SMALL_TIMEOUT, {}),
     (DatasetClient, 'delete', dataset._SMALL_TIMEOUT, {}),
     (DatasetClient, 'list_items', DEFAULT_TIMEOUT, {}),
-    (DatasetClient, 'download_items', DEFAULT_TIMEOUT, {}),
     (DatasetClient, 'get_items_as_bytes', DEFAULT_TIMEOUT, {}),
     (DatasetClient, 'push_items', dataset._MEDIUM_TIMEOUT, {'items': {}}),
     (DatasetClient, 'get_statistics', dataset._SMALL_TIMEOUT, {}),