Skip to content

Commit d4476ea

Browse files
authored
Fix vcr (#14)
This should fix the tests on main. I think the issue was that the token could be different for planetary computer, so I am loosening up the match.
1 parent 05b95f0 commit d4476ea

File tree

3 files changed

+32
-22
lines changed

3 files changed

+32
-22
lines changed

tests/cassettes/fixtures/simple_reference_file.yaml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ interactions:
7979
Content-Type:
8080
- application/json
8181
Date:
82-
- Fri, 10 Mar 2023 14:41:21 GMT
82+
- Mon, 13 Mar 2023 17:42:59 GMT
8383
Strict-Transport-Security:
8484
- max-age=15724800; includeSubDomains
8585
Vary:
8686
- Accept-Encoding
8787
X-Azure-Ref:
88-
- 0kUELZAAAAAATcXAcuTQLQp/r1/NbCoVPTU5aMjIxMDYwNjEzMDUzADkyN2FiZmE2LTE5ZjYtNGFmMS1hMDlkLWM5NTlkOWExZTY0NA==
88+
- 0o2APZAAAAAChwds5zqelR4QRbTn5fSNWRVdSMzBFREdFMDYxNwA5MjdhYmZhNi0xOWY2LTRhZjEtYTA5ZC1jOTU5ZDlhMWU2NDQ=
8989
X-Cache:
9090
- CONFIG_NOCACHE
9191
status:
@@ -191,13 +191,13 @@ interactions:
191191
Content-Type:
192192
- application/json
193193
Date:
194-
- Fri, 10 Mar 2023 14:41:21 GMT
194+
- Mon, 13 Mar 2023 17:42:59 GMT
195195
Strict-Transport-Security:
196196
- max-age=15724800; includeSubDomains
197197
Vary:
198198
- Accept-Encoding
199199
X-Azure-Ref:
200-
- 0kUELZAAAAAChLP4T1qYvS4/mixJSqKBhTU5aMjIxMDYwNjEzMDUzADkyN2FiZmE2LTE5ZjYtNGFmMS1hMDlkLWM5NTlkOWExZTY0NA==
200+
- 0pGAPZAAAAAD80WYvhVz1QZI84un+NQvWRVdSMzBFREdFMDYxNwA5MjdhYmZhNi0xOWY2LTRhZjEtYTA5ZC1jOTU5ZDlhMWU2NDQ=
201201
X-Cache:
202202
- CONFIG_NOCACHE
203203
status:
@@ -218,20 +218,20 @@ interactions:
218218
uri: https://planetarycomputer.microsoft.com/api/sas/v1/token/nasagddp/nex-gddp-cmip6-references
219219
response:
220220
body:
221-
string: '{"msft:expiry":"2023-03-10T15:26:22Z","token":"st=2023-03-09T14%3A41%3A22Z&se=2023-03-10T15%3A26%3A22Z&sp=rl&sv=2021-06-08&sr=c&skoid=c85c15d6-d1ae-42d4-af60-e2ca0f81359b&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2023-03-10T14%3A41%3A21Z&ske=2023-03-17T14%3A41%3A21Z&sks=b&skv=2021-06-08&sig=CLzwCkCFODmCPycaEIvkGOmEsgKy1SR%2BKFB8t055CcI%3D"}'
221+
string: '{"msft:expiry":"2023-03-13T18:28:00Z","token":"st=2023-03-12T17%3A43%3A00Z&se=2023-03-13T18%3A28%3A00Z&sp=rl&sv=2021-06-08&sr=c&skoid=c85c15d6-d1ae-42d4-af60-e2ca0f81359b&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2023-03-10T15%3A03%3A45Z&ske=2023-03-17T15%3A03%3A45Z&sks=b&skv=2021-06-08&sig=nS2bzAQi/0rKi0/IJf8zmCEL4C1Y7im%2BcH0bDW71DVA%3D"}'
222222
headers:
223223
Content-Length:
224224
- '347'
225225
Content-Type:
226226
- application/json
227227
Date:
228-
- Fri, 10 Mar 2023 14:41:22 GMT
228+
- Mon, 13 Mar 2023 17:43:00 GMT
229229
Request-Context:
230230
- appId=cid-v1:75161b1b-6883-4b66-9410-715040c44427
231231
Strict-Transport-Security:
232232
- max-age=15724800; includeSubDomains
233233
X-Azure-Ref:
234-
- 0kUELZAAAAADYm+fYCwU1Q7linTDfMrVCTU5aMjIxMDYwNjEzMDI3ADkyN2FiZmE2LTE5ZjYtNGFmMS1hMDlkLWM5NTlkOWExZTY0NA==
234+
- 0pGAPZAAAAAAsZ6wA6NQVQK0hTxt70kLdRVdSMzBFREdFMDYwNgA5MjdhYmZhNi0xOWY2LTRhZjEtYTA5ZC1jOTU5ZDlhMWU2NDQ=
235235
X-Cache:
236236
- CONFIG_NOCACHE
237237
status:
@@ -252,22 +252,26 @@ interactions:
252252
uri: https://planetarycomputer.microsoft.com/api/sas/v1/token/pcstacitems/items
253253
response:
254254
body:
255-
string: '{"msft:expiry":"2023-03-10T15:26:23Z","token":"st=2023-03-09T14%3A41%3A23Z&se=2023-03-10T15%3A26%3A23Z&sp=rl&sv=2021-06-08&sr=c&skoid=c85c15d6-d1ae-42d4-af60-e2ca0f81359b&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2023-03-10T05%3A08%3A48Z&ske=2023-03-17T05%3A08%3A48Z&sks=b&skv=2021-06-08&sig=JENqm24/FVlU0sbnJk4F9f6IYLlGIRmYr1OYGiWW/KE%3D"}'
255+
string: '{"msft:expiry":"2023-03-13T18:28:01Z","token":"st=2023-03-12T17%3A43%3A01Z&se=2023-03-13T18%3A28%3A01Z&sp=rl&sv=2021-06-08&sr=c&skoid=c85c15d6-d1ae-42d4-af60-e2ca0f81359b&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2023-03-13T06%3A31%3A23Z&ske=2023-03-20T06%3A31%3A23Z&sks=b&skv=2021-06-08&sig=RZas6nnA8wWqcuaaztwhxzK8ct483vgLeWqyPDmfMQc%3D"}'
256256
headers:
257+
Accept-Ranges:
258+
- bytes
259+
Connection:
260+
- keep-alive
257261
Content-Length:
258262
- '345'
259263
Content-Type:
260264
- application/json
261265
Date:
262-
- Fri, 10 Mar 2023 14:41:22 GMT
266+
- Mon, 13 Mar 2023 17:43:01 GMT
263267
Request-Context:
264268
- appId=cid-v1:75161b1b-6883-4b66-9410-715040c44427
265269
Strict-Transport-Security:
266270
- max-age=15724800; includeSubDomains
267-
X-Azure-Ref:
268-
- 0kkELZAAAAADPAvNJCHu/Sa0MqBtpJWmDTU5aMjIxMDYwNjE0MDIxADkyN2FiZmE2LTE5ZjYtNGFmMS1hMDlkLWM5NTlkOWExZTY0NA==
269271
X-Cache:
270272
- CONFIG_NOCACHE
273+
x-azure-ref:
274+
- 20230313T174301Z-dq5bdp1dv96rffyfvc1uzxvz2c00000002e000000001gn4u
271275
status:
272276
code: 200
273277
message: OK

tests/cassettes/fixtures/simple_zarr.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ interactions:
7979
Content-Type:
8080
- application/json
8181
Date:
82-
- Fri, 10 Mar 2023 15:01:33 GMT
82+
- Mon, 13 Mar 2023 17:42:44 GMT
8383
Strict-Transport-Security:
8484
- max-age=15724800; includeSubDomains
8585
Vary:
8686
- Accept-Encoding
8787
X-Azure-Ref:
88-
- 0TkYLZAAAAAA+mnRemjJDT5tx8W62wh7OTU5aMjIxMDYwNjE0MDQ5ADkyN2FiZmE2LTE5ZjYtNGFmMS1hMDlkLWM5NTlkOWExZTY0NA==
88+
- 0lGAPZAAAAAC2hZZJBhqdQpgwUoWe4x6FRVdSMzBFREdFMDUxNQA5MjdhYmZhNi0xOWY2LTRhZjEtYTA5ZC1jOTU5ZDlhMWU2NDQ=
8989
X-Cache:
9090
- CONFIG_NOCACHE
9191
status:
@@ -168,13 +168,13 @@ interactions:
168168
Content-Type:
169169
- application/json
170170
Date:
171-
- Fri, 10 Mar 2023 15:01:34 GMT
171+
- Mon, 13 Mar 2023 17:42:44 GMT
172172
Strict-Transport-Security:
173173
- max-age=15724800; includeSubDomains
174174
Vary:
175175
- Accept-Encoding
176176
X-Azure-Ref:
177-
- 0TkYLZAAAAAA9mTCMbEWPRpsnVV+LDuuRTU5aMjIxMDYwNjE0MDQ5ADkyN2FiZmE2LTE5ZjYtNGFmMS1hMDlkLWM5NTlkOWExZTY0NA==
177+
- 0lWAPZAAAAAAhAgjLIa9JRInbQjw3kBw+RVdSMzBFREdFMDUxNQA5MjdhYmZhNi0xOWY2LTRhZjEtYTA5ZC1jOTU5ZDlhMWU2NDQ=
178178
X-Cache:
179179
- CONFIG_NOCACHE
180180
status:
@@ -195,22 +195,26 @@ interactions:
195195
uri: https://planetarycomputer.microsoft.com/api/sas/v1/token/daymeteuwest/daymet-zarr
196196
response:
197197
body:
198-
string: '{"msft:expiry":"2023-03-10T15:46:35Z","token":"st=2023-03-09T15%3A01%3A35Z&se=2023-03-10T15%3A46%3A35Z&sp=rl&sv=2021-06-08&sr=c&skoid=c85c15d6-d1ae-42d4-af60-e2ca0f81359b&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2023-03-04T03%3A47%3A09Z&ske=2023-03-11T03%3A47%3A09Z&sks=b&skv=2021-06-08&sig=awHouLOuDvbjcE1YNRnYrTGx7hjrVouJfY4KI/DNzz8%3D"}'
198+
string: '{"msft:expiry":"2023-03-13T18:27:46Z","token":"st=2023-03-12T17%3A42%3A45Z&se=2023-03-13T18%3A27%3A46Z&sp=rl&sv=2021-06-08&sr=c&skoid=c85c15d6-d1ae-42d4-af60-e2ca0f81359b&sktid=72f988bf-86f1-41af-91ab-2d7cd011db47&skt=2023-03-13T17%3A42%3A44Z&ske=2023-03-20T17%3A42%3A44Z&sks=b&skv=2021-06-08&sig=S49ZE9wvUZOklQ46l6cftC7Eb%2BVYAxOLycOu3rr59Tw%3D"}'
199199
headers:
200+
Accept-Ranges:
201+
- bytes
202+
Connection:
203+
- keep-alive
200204
Content-Length:
201-
- '345'
205+
- '347'
202206
Content-Type:
203207
- application/json
204208
Date:
205-
- Fri, 10 Mar 2023 15:01:35 GMT
209+
- Mon, 13 Mar 2023 17:42:46 GMT
206210
Request-Context:
207211
- appId=cid-v1:75161b1b-6883-4b66-9410-715040c44427
208212
Strict-Transport-Security:
209213
- max-age=15724800; includeSubDomains
210-
X-Azure-Ref:
211-
- 0T0YLZAAAAACOgRrebyhLRLr48Zi9kqy+TU5aMjIxMDYwNjEzMDI5ADkyN2FiZmE2LTE5ZjYtNGFmMS1hMDlkLWM5NTlkOWExZTY0NA==
212214
X-Cache:
213215
- CONFIG_NOCACHE
216+
x-azure-ref:
217+
- 20230313T174245Z-bmpq73ce4p00b721t6x6p6ebw000000002eg00000001vq0v
214218
status:
215219
code: 200
216220
message: OK

tests/conftest.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ def simple_search() -> pystac_client.ItemSearch:
3838

3939
@pytest.fixture(scope="module")
4040
def simple_reference_file() -> pystac.Asset:
41-
with vcr.use_cassette("tests/cassettes/fixtures/simple_reference_file.yaml"):
41+
_vcr = vcr.VCR(match_on=["uri", "method"])
42+
with _vcr.use_cassette("tests/cassettes/fixtures/simple_reference_file.yaml"):
4243
client = pystac_client.Client.open(
4344
STAC_URLS["PLANETARY-COMPUTER"],
4445
modifier=planetary_computer.sign_inplace,
@@ -49,7 +50,8 @@ def simple_reference_file() -> pystac.Asset:
4950

5051
@pytest.fixture(scope="module")
5152
def simple_zarr() -> pystac.Asset:
52-
with vcr.use_cassette("tests/cassettes/fixtures/simple_zarr.yaml"):
53+
_vcr = vcr.VCR(match_on=["uri", "method"])
54+
with _vcr.use_cassette("tests/cassettes/fixtures/simple_zarr.yaml"):
5355
catalog = pystac_client.Client.open(
5456
STAC_URLS["PLANETARY-COMPUTER"],
5557
modifier=planetary_computer.sign_inplace,

0 commit comments

Comments
 (0)