Skip to content

Commit 5cd8221

Browse files
committed
Mv proxy tests to a separate module
1 parent 22f646f commit 5cd8221

File tree

2 files changed

+38
-36
lines changed

2 files changed

+38
-36
lines changed

tests/client/test_proxy.py

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import pytest
2+
3+
from scrapinghub.client.proxy import _format_iter_filters
4+
5+
6+
def test_format_iter_filters():
7+
# work with empty params
8+
assert _format_iter_filters({}) == {}
9+
10+
# doesn't affect other params
11+
params = {'a': 123, 'b': 456}
12+
assert _format_iter_filters(params) == params
13+
14+
# pass filter as-is if not list
15+
params = {'filter': 'some-string'}
16+
assert _format_iter_filters(params) == params
17+
18+
# work fine with empty filter
19+
params = {'filter': []}
20+
assert _format_iter_filters(params) == params
21+
22+
# pass string filters as-is
23+
params = {'filter': ['str1', 'str2']}
24+
assert _format_iter_filters(params) == params
25+
26+
# converts list-formatted filters
27+
params = {'filter': [['field', '>=', ['val']], 'filter2']}
28+
assert (_format_iter_filters(params) ==
29+
{'filter': ['["field", ">=", ["val"]]', 'filter2']})
30+
31+
# works the same with tuple entries
32+
params = {'filter': [('field', '==', ['val'])]}
33+
assert (_format_iter_filters(params) ==
34+
{'filter': ['["field", "==", ["val"]]']})
35+
36+
# exception if entry is not list/tuple or string
37+
with pytest.raises(ValueError):
38+
_format_iter_filters({'filter': ['test', 123]})

tests/client/test_utils.py

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,6 @@
55
import mock
66

77
from scrapinghub.client.utils import parse_auth
8-
from scrapinghub.client.proxy import _format_iter_filters
9-
10-
11-
def test_format_iter_filters():
12-
# work with empty params
13-
assert _format_iter_filters({}) == {}
14-
15-
# doesn't affect other params
16-
params = {'a': 123, 'b': 456}
17-
assert _format_iter_filters(params) == params
18-
19-
# pass filter as-is if not list
20-
params = {'filter': 'some-string'}
21-
assert _format_iter_filters(params) == params
22-
23-
# work fine with empty filter
24-
params = {'filter': []}
25-
assert _format_iter_filters(params) == params
26-
27-
# pass string filters as-is
28-
params = {'filter': ['str1', 'str2']}
29-
assert _format_iter_filters(params) == params
30-
31-
# converts list-formatted filters
32-
params = {'filter': [['field', '>=', ['val']], 'filter2']}
33-
assert (_format_iter_filters(params) ==
34-
{'filter': ['["field", ">=", ["val"]]', 'filter2']})
35-
36-
# works the same with tuple entries
37-
params = {'filter': [('field', '==', ['val'])]}
38-
assert (_format_iter_filters(params) ==
39-
{'filter': ['["field", "==", ["val"]]']})
40-
41-
# exception if entry is not list/tuple or string
42-
with pytest.raises(ValueError):
43-
_format_iter_filters({'filter': ['test', 123]})
448

459

4610
def test_parse_auth_none():

0 commit comments

Comments
 (0)