From c35104748dac99ee4777cfa057c1afa65ed2a117 Mon Sep 17 00:00:00 2001 From: halcy Date: Thu, 17 Nov 2022 23:51:40 +0200 Subject: maybe fix tests --- tests/cassettes/test_min_max_id_datetimes.yaml | 50 ++++++++++----------- .../test_min_max_id_datetimes_datetimeobjects.pkl | Bin 93 -> 136 bytes tests/test_timeline.py | 11 ++++- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/tests/cassettes/test_min_max_id_datetimes.yaml b/tests/cassettes/test_min_max_id_datetimes.yaml index 7b5a274..082d50c 100644 --- a/tests/cassettes/test_min_max_id_datetimes.yaml +++ b/tests/cassettes/test_min_max_id_datetimes.yaml @@ -20,7 +20,7 @@ interactions: uri: http://localhost:3000/api/v1/statuses response: body: - string: '{"id":"109360920389596939","created_at":"2022-11-17T20:00:15.907Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109360920389596939","url":"http://localhost:3000/@mastodonpy_test/109360920389596939","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eToot!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py + string: '{"id":"109361356928932952","created_at":"2022-11-17T21:51:16.968Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109361356928932952","url":"http://localhost:3000/@mastodonpy_test/109361356928932952","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eToot!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py test suite","website":null},"account":{"id":"109337440686176140","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John Lennon","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"\u003cp\u003eI walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","followers_count":0,"following_count":0,"statuses_count":7,"last_status_at":"2022-11-17","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}' @@ -30,7 +30,7 @@ interactions: Content-Security-Policy: - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000; - style-src ''self'' http://localhost:3000 ''nonce-eu9ApZVeWmOtnW3cjhpGVg==''; + style-src ''self'' http://localhost:3000 ''nonce-Wze0VHokLwYZzGZsh21BIg==''; media-src ''self'' https: data: http://localhost:3000; frame-src ''self'' https:; manifest-src ''self'' http://localhost:3000; connect-src ''self'' data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000 @@ -40,7 +40,7 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"1b1f51ff5c8829fe893b287e7435a814" + - W/"e61d0e228d8657f6ccd5c18304a4f1c7" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -58,13 +58,13 @@ interactions: X-RateLimit-Limit: - '300' X-RateLimit-Remaining: - - '291' + - '299' X-RateLimit-Reset: - - '2022-11-17T21:00:00.931702Z' + - '2022-11-18T00:00:00.990213Z' X-Request-Id: - - 1d7fbb0b-3d84-4da4-8fd1-1a8eb47e6bdd + - 75f26554-cf0a-478e-a28d-aa07fe7699c1 X-Runtime: - - '0.037621' + - '0.040252' X-XSS-Protection: - 1; mode=block status: @@ -84,10 +84,10 @@ interactions: User-Agent: - tests/v311 method: GET - uri: http://localhost:3000/api/v1/timelines/home?max_id=109360921640960000&min_id=109360919019520000 + uri: http://localhost:3000/api/v1/timelines/home?max_id=109361358176256000&min_id=109361355554816000 response: body: - string: '[{"id":"109360920389596939","created_at":"2022-11-17T20:00:15.907Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109360920389596939","url":"http://localhost:3000/@mastodonpy_test/109360920389596939","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eToot!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py + string: '[{"id":"109361356928932952","created_at":"2022-11-17T21:51:16.968Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109361356928932952","url":"http://localhost:3000/@mastodonpy_test/109361356928932952","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eToot!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py test suite","website":null},"account":{"id":"109337440686176140","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John Lennon","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"\u003cp\u003eI walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","followers_count":0,"following_count":0,"statuses_count":7,"last_status_at":"2022-11-17","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}]' @@ -97,7 +97,7 @@ interactions: Content-Security-Policy: - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000; - style-src ''self'' http://localhost:3000 ''nonce-BVkzXWWXoczXLIl9nwSoWw==''; + style-src ''self'' http://localhost:3000 ''nonce-/U4/IBa1u7/14h9/kkCoPA==''; media-src ''self'' https: data: http://localhost:3000; frame-src ''self'' https:; manifest-src ''self'' http://localhost:3000; connect-src ''self'' data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000 @@ -107,10 +107,10 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"a0a4a89f2613e8efe1b7ff788d6a56f5" + - W/"68fd8fd0bc8b32aea5450a1f00072741" Link: - - ; rel="next", - ; rel="prev" + - ; rel="next", + ; rel="prev" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -126,9 +126,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - f9e7cc0b-47e5-4b02-9da2-fc41574a8d2a + - 5aecbb98-aa41-42ef-819a-9a7194fbb91a X-Runtime: - - '0.021379' + - '0.022338' X-XSS-Protection: - 1; mode=block status: @@ -148,7 +148,7 @@ interactions: User-Agent: - tests/v311 method: GET - uri: http://localhost:3000/api/v1/timelines/home?max_id=109360922951680000&min_id=109360921640960000 + uri: http://localhost:3000/api/v1/timelines/home?max_id=109361359486976000&min_id=109361358176256000 response: body: string: '[]' @@ -158,7 +158,7 @@ interactions: Content-Security-Policy: - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000; - style-src ''self'' http://localhost:3000 ''nonce-pzcUQhXaLhmCAXOMbYOrTg==''; + style-src ''self'' http://localhost:3000 ''nonce-9y78d6yOrkrcKX9mQp3WTw==''; media-src ''self'' https: data: http://localhost:3000; frame-src ''self'' https:; manifest-src ''self'' http://localhost:3000; connect-src ''self'' data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000 @@ -184,9 +184,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - 01914c1c-b360-461d-a68e-e7b0bc156447 + - d4f8db1a-03c9-44a4-89dd-ef0159e4a00f X-Runtime: - - '0.008764' + - '0.009579' X-XSS-Protection: - 1; mode=block status: @@ -208,10 +208,10 @@ interactions: User-Agent: - tests/v311 method: DELETE - uri: http://localhost:3000/api/v1/statuses/109360920389596939 + uri: http://localhost:3000/api/v1/statuses/109361356928932952 response: body: - string: '{"id":"109360920389596939","created_at":"2022-11-17T20:00:15.907Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109360920389596939","url":"http://localhost:3000/@mastodonpy_test/109360920389596939","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"Toot!","filtered":[],"reblog":null,"application":{"name":"Mastodon.py + string: '{"id":"109361356928932952","created_at":"2022-11-17T21:51:16.968Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109361356928932952","url":"http://localhost:3000/@mastodonpy_test/109361356928932952","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"Toot!","filtered":[],"reblog":null,"application":{"name":"Mastodon.py test suite","website":null},"account":{"id":"109337440686176140","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John Lennon","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"\u003cp\u003eI walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","followers_count":0,"following_count":0,"statuses_count":6,"last_status_at":"2022-11-17","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}' @@ -221,7 +221,7 @@ interactions: Content-Security-Policy: - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000; - style-src ''self'' http://localhost:3000 ''nonce-JQ6J37EfMdjQbrYXpw7SOw==''; + style-src ''self'' http://localhost:3000 ''nonce-5wpK9zpFeDxFYga8QqVhrA==''; media-src ''self'' https: data: http://localhost:3000; frame-src ''self'' https:; manifest-src ''self'' http://localhost:3000; connect-src ''self'' data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000 @@ -231,7 +231,7 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"1ae721011c6bf203187d567b52a82145" + - W/"6cdc52fd88e914cc490d0db147b2cccd" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -247,9 +247,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - f82b9cd7-463b-4142-9034-ba19dfb323d0 + - d0c1d221-b16a-45c3-8ba1-789444b14b96 X-Runtime: - - '0.023947' + - '0.026318' X-XSS-Protection: - 1; mode=block status: diff --git a/tests/cassettes/test_min_max_id_datetimes_datetimeobjects.pkl b/tests/cassettes/test_min_max_id_datetimes_datetimeobjects.pkl index dbcbed1..58569a2 100644 Binary files a/tests/cassettes/test_min_max_id_datetimes_datetimeobjects.pkl and b/tests/cassettes/test_min_max_id_datetimes_datetimeobjects.pkl differ diff --git a/tests/test_timeline.py b/tests/test_timeline.py index 9d63025..85026f6 100644 --- a/tests/test_timeline.py +++ b/tests/test_timeline.py @@ -81,12 +81,19 @@ def test_min_max_id(api, status): @pytest.mark.vcr() def test_min_max_id_datetimes(api, status): if os.path.exists("tests/cassettes/test_min_max_id_datetimes_datetimeobjects.pkl"): - the_past, the_future, the_far_future = pickle.load(open("tests/cassettes/test_min_max_id_datetimes_datetimeobjects.pkl", 'rb')) + data_dict = pickle.load(open("tests/cassettes/test_min_max_id_datetimes_datetimeobjects.pkl", 'rb')) + the_past = data_dict["the_past"] + the_future = data_dict["the_future"] + the_far_future = data_dict["the_far_future"] else: the_past = datetime.datetime.now() - datetime.timedelta(seconds=20) the_future = datetime.datetime.now() + datetime.timedelta(seconds=20) the_far_future = datetime.datetime.now() + datetime.timedelta(seconds=40) - pickle.dump((the_past, the_future, the_far_future), open("tests/cassettes/test_min_max_id_datetimes_datetimeobjects.pkl", 'wb')) + pickle.dump({ + "the_past": the_past, + "the_future": the_future, + "the_far_future": the_far_future, + }, open("tests/cassettes/test_min_max_id_datetimes_datetimeobjects.pkl", 'wb')) time.sleep(3) tl = api.timeline_home(min_id = the_past, max_id = the_future) -- cgit v1.2.3