Skip to content

Commit 2d31a37

Browse files
committed
Move shared parametrized_api_urls to util file
1 parent 116621b commit 2d31a37

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

tests/integration/conftest.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,6 @@
77
TOKEN_ENV_VAR = 'APIFY_TEST_USER_API_TOKEN'
88
API_URL_ENV_VAR = 'APIFY_INTEGRATION_TESTS_API_URL'
99

10-
parametrized_api_urls = pytest.mark.parametrize(
11-
('api_url', 'api_public_url'),
12-
[
13-
('https://api.apify.com', 'https://api.apify.com'),
14-
('https://api.apify.com', None),
15-
('https://api.apify.com', 'https://custom-public-url.com'),
16-
('https://api.apify.com', 'https://custom-public-url.com/with/custom/path'),
17-
('https://api.apify.com', 'https://custom-public-url.com/with/custom/path/'),
18-
('http://10.0.88.214:8010', 'https://api.apify.com'),
19-
('http://10.0.88.214:8010', None),
20-
],
21-
)
22-
2310

2411
@pytest.fixture
2512
def api_token() -> str:
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
11
import secrets
22
import string
33

4+
import pytest
5+
46

57
def random_string(length: int = 10) -> str:
68
return ''.join(secrets.choice(string.ascii_letters) for _ in range(length))
79

810

911
def random_resource_name(resource: str) -> str:
1012
return f'python-client-test-{resource}-{random_string(5)}'
13+
14+
15+
parametrized_api_urls = pytest.mark.parametrize(
16+
('api_url', 'api_public_url'),
17+
[
18+
('https://api.apify.com', 'https://api.apify.com'),
19+
('https://api.apify.com', None),
20+
('https://api.apify.com', 'https://custom-public-url.com'),
21+
('https://api.apify.com', 'https://custom-public-url.com/with/custom/path'),
22+
('https://api.apify.com', 'https://custom-public-url.com/with/custom/path/'),
23+
('http://10.0.88.214:8010', 'https://api.apify.com'),
24+
('http://10.0.88.214:8010', None),
25+
],
26+
)

tests/integration/test_dataset.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
import impit
77

8-
from integration.conftest import parametrized_api_urls
9-
from integration.integration_test_utils import random_resource_name
8+
from integration.integration_test_utils import parametrized_api_urls, random_resource_name
109

1110
from apify_client import ApifyClient, ApifyClientAsync
1211
from apify_client.client import DEFAULT_API_URL

tests/integration/test_key_value_store.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
import impit
77

8-
from integration.conftest import parametrized_api_urls
9-
from integration.integration_test_utils import random_resource_name
8+
from integration.integration_test_utils import parametrized_api_urls, random_resource_name
109

1110
from apify_client import ApifyClient, ApifyClientAsync
1211
from apify_client.client import DEFAULT_API_URL

0 commit comments

Comments
 (0)