Skip to content

Commit 774c574

Browse files
deedy5deedy5
committed
tests: update
1 parent 9a16101 commit 774c574

File tree

3 files changed

+59
-21
lines changed

3 files changed

+59
-21
lines changed

‎tests/test_asyncclient.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ async def test_asyncclient_init():
4141
assert response.status_code == 200
4242
json_data = response.json()
4343
assert json_data["headers"]["X-Test"] == "test"
44-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
4544
assert json_data["headers"]["Authorization"] == "Basic dXNlcjpwYXNzd29yZA=="
46-
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
45+
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
46+
# temp
47+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
48+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
49+
assert "cccc=dddd" in json_data["headers"]["Cookie"]

‎tests/test_client.py

+27-10
Original file line numberDiff line numberDiff line change
@@ -42,36 +42,41 @@ def test_client_init_params():
4242
assert response.headers["content-type"] == "application/json"
4343
json_data = response.json()
4444
assert json_data["headers"]["X-Test"] == "test"
45-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
4645
assert json_data["headers"]["Authorization"] == "Basic dXNlcjpwYXNzd29yZA=="
4746
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
47+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
48+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
49+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
4850

4951

5052
@retry()
5153
def test_client_setters():
5254
client = primp.Client()
5355
client.auth = ("user", "password")
5456
client.headers = {"X-Test": "TesT"}
55-
client.cookies = {"ccc": "ddd", "cccc": "dddd"}
5657
client.params = {"x": "aaa", "y": "bbb"}
5758
client.timeout = 20
5859

60+
client.set_cookies("https://httpbin.org/anything", {"ccc": "ddd", "cccc": "dddd"})
61+
assert client.get_cookies("https://httpbin.org/anything") == {"ccc": "ddd", "cccc": "dddd"}
62+
5963
response = client.get("https://httpbin.org/anything")
6064
assert response.status_code == 200
6165
assert response.status_code == 200
6266
assert client.auth == ("user", "password")
6367
assert client.headers == {"x-test": "TesT"}
64-
assert client.cookies == {"ccc": "ddd", "cccc": "dddd"}
6568
assert client.params == {"x": "aaa", "y": "bbb"}
6669
assert client.timeout == 20.0
6770
json_data = response.json()
6871
assert json_data["method"] == "GET"
6972
assert json_data["headers"]["X-Test"] == "TesT"
70-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
7173
assert json_data["headers"]["Authorization"] == "Basic dXNlcjpwYXNzd29yZA=="
7274
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
7375
assert "Basic dXNlcjpwYXNzd29yZA==" in response.text
7476
assert b"Basic dXNlcjpwYXNzd29yZA==" in response.content
77+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
78+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
79+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
7580

7681

7782
@retry()
@@ -93,11 +98,13 @@ def test_client_request_get():
9398
json_data = response.json()
9499
assert json_data["method"] == "GET"
95100
assert json_data["headers"]["X-Test"] == "test"
96-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
97101
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
98102
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
99103
assert "Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.text
100104
assert b"Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.content
105+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
106+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
107+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
101108

102109

103110
@retry()
@@ -118,11 +125,13 @@ def test_client_get():
118125
json_data = response.json()
119126
assert json_data["method"] == "GET"
120127
assert json_data["headers"]["X-Test"] == "test"
121-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
122128
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
123129
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
124130
assert "Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.text
125131
assert b"Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.content
132+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
133+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
134+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
126135

127136

128137
@retry()
@@ -145,10 +154,12 @@ def test_client_post_content():
145154
json_data = response.json()
146155
assert json_data["method"] == "POST"
147156
assert json_data["headers"]["X-Test"] == "test"
148-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
149157
assert json_data["headers"]["Authorization"] == "Basic dXNlcjpwYXNzd29yZA=="
150158
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
151159
assert json_data["data"] == "test content"
160+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
161+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
162+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
152163

153164

154165
@retry()
@@ -171,10 +182,12 @@ def test_client_post_data():
171182
json_data = response.json()
172183
assert json_data["method"] == "POST"
173184
assert json_data["headers"]["X-Test"] == "test"
174-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
175185
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
176186
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
177187
assert json_data["form"] == {"key1": "value1", "key2": "value2"}
188+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
189+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
190+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
178191

179192

180193
@retry()
@@ -197,10 +210,12 @@ def test_client_post_json():
197210
json_data = response.json()
198211
assert json_data["method"] == "POST"
199212
assert json_data["headers"]["X-Test"] == "test"
200-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
201213
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
202214
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
203215
assert json_data["json"] == data
216+
# temp
217+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
218+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
204219

205220

206221
@pytest.fixture(scope="session")
@@ -235,10 +250,12 @@ def test_client_post_files(test_files):
235250
json_data = response.json()
236251
assert json_data["method"] == "POST"
237252
assert json_data["headers"]["X-Test"] == "test"
238-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
239253
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
240254
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
241255
assert json_data["files"] == {"file1": "aaa111", "file2": "bbb222"}
256+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
257+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
258+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
242259

243260

244261
@retry()

‎tests/test_defs.py

+27-9
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ def test_request_get():
4444
json_data = response.json()
4545
assert json_data["method"] == "GET"
4646
assert json_data["headers"]["X-Test"] == "test"
47-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
4847
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
4948
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
5049
assert "Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.text
5150
assert b"Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.content
51+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
52+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
53+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
5254

5355

5456
@retry()
@@ -68,11 +70,13 @@ def test_get():
6870
json_data = response.json()
6971
assert json_data["method"] == "GET"
7072
assert json_data["headers"]["X-Test"] == "test"
71-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
7273
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
7374
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
7475
assert "Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.text
7576
assert b"Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.content
77+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
78+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
79+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
7680

7781

7882
@retry()
@@ -117,11 +121,13 @@ def test_delete():
117121
json_data = response.json()
118122
assert json_data["method"] == "DELETE"
119123
assert json_data["headers"]["X-Test"] == "test"
120-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
121124
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
122125
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
123126
assert "Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.text
124127
assert b"Bearer bearerXXXXXXXXXXXXXXXXXXXX" in response.content
128+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
129+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
130+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
125131

126132

127133
@retry()
@@ -143,10 +149,12 @@ def test_post_content():
143149
json_data = response.json()
144150
assert json_data["method"] == "POST"
145151
assert json_data["headers"]["X-Test"] == "test"
146-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
147152
assert json_data["headers"]["Authorization"] == "Basic dXNlcjpwYXNzd29yZA=="
148153
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
149154
assert json_data["data"] == "test content"
155+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
156+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
157+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
150158

151159

152160
@retry()
@@ -168,10 +176,12 @@ def test_post_data():
168176
json_data = response.json()
169177
assert json_data["method"] == "POST"
170178
assert json_data["headers"]["X-Test"] == "test"
171-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
172179
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
173180
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
174181
assert json_data["form"] == {"key1": "value1", "key2": "value2"}
182+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
183+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
184+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
175185

176186

177187
@retry()
@@ -193,10 +203,12 @@ def test_post_json():
193203
json_data = response.json()
194204
assert json_data["method"] == "POST"
195205
assert json_data["headers"]["X-Test"] == "test"
196-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
197206
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
198207
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
199208
assert json_data["json"] == data
209+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
210+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
211+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
200212

201213

202214
@pytest.fixture(scope="session")
@@ -230,10 +242,12 @@ def test_client_post_files(test_files):
230242
json_data = response.json()
231243
assert json_data["method"] == "POST"
232244
assert json_data["headers"]["X-Test"] == "test"
233-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
234245
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
235246
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
236247
assert json_data["files"] == {"file1": "aaa111", "file2": "bbb222"}
248+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
249+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
250+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
237251

238252

239253
@retry()
@@ -255,10 +269,12 @@ def test_patch():
255269
json_data = response.json()
256270
assert json_data["method"] == "PATCH"
257271
assert json_data["headers"]["X-Test"] == "test"
258-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
259272
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
260273
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
261274
assert json_data["form"] == {"key1": "value1", "key2": "value2"}
275+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
276+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
277+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
262278

263279

264280
@retry()
@@ -280,10 +296,12 @@ def test_put():
280296
json_data = response.json()
281297
assert json_data["method"] == "PUT"
282298
assert json_data["headers"]["X-Test"] == "test"
283-
assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
284299
assert json_data["headers"]["Authorization"] == "Bearer bearerXXXXXXXXXXXXXXXXXXXX"
285300
assert json_data["args"] == {"x": "aaa", "y": "bbb"}
286301
assert json_data["form"] == {"key1": "value1", "key2": "value2"}
302+
# assert json_data["headers"]["Cookie"] == "ccc=ddd; cccc=dddd"
303+
assert "ccc=ddd" in json_data["headers"]["Cookie"]
304+
assert "cccc=dddd" in json_data["headers"]["Cookie"]
287305

288306

289307
@retry()

0 commit comments

Comments
 (0)