From cb9062e5e1209cd58b22e57049cca1425449d41a Mon Sep 17 00:00:00 2001 From: Lorenz Diener Date: Fri, 11 Oct 2019 22:38:07 +0200 Subject: Try to fix frozen dismiss cassette --- .../test_notifications_dismiss.yaml | 112 +++++++++------------ 1 file changed, 49 insertions(+), 63 deletions(-) diff --git a/tests/cassettes_pre_2_9_2/test_notifications_dismiss.yaml b/tests/cassettes_pre_2_9_2/test_notifications_dismiss.yaml index 25c31e2..0a5cf03 100644 --- a/tests/cassettes_pre_2_9_2/test_notifications_dismiss.yaml +++ b/tests/cassettes_pre_2_9_2/test_notifications_dismiss.yaml @@ -1,36 +1,49 @@ interactions: - request: - body: status=%40mastodonpy_test+hello%21 + body: null headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] - Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN_2] + Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN] Connection: [keep-alive] - Content-Length: ['34'] - Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] - method: POST - uri: http://localhost:3000/api/v1/statuses + method: GET + uri: http://localhost:3000/api/v1/notifications response: - body: {string: '{"id":"102317291057725861","created_at":"2019-06-22T21:12:41.706Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost/users/admin/statuses/102317291057725861","url":"http://localhost/@admin/102317291057725861","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"content":"\u003cp\u003e\u003cspan - class=\"h-card\"\u003e\u003ca href=\"http://localhost/@mastodonpy_test\" class=\"u-url - mention\"\u003e@\u003cspan\u003emastodonpy_test\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e - hello!\u003c/p\u003e","reblog":null,"application":{"name":"Mastodon.py test - suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T12:42:50.096Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":2,"following_count":1,"statuses_count":17,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"1234567890123456","username":"mastodonpy_test","url":"http://localhost/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}'} + body: + string: !!binary | + H4sIACbooF0AA+xZS4/iOBD+K9mcgTjOi2Q10lz3sLc57fQImcSAZxzbih260Yr/vuU8SHhMQ49G + q24pF4jLVbar/FXVF/j6r8sKN3P9ALsz1xwUhUFJhWFSgCCvKDG0WBEDYoz8dO6jue9/wSgLkixK + Fkka/gN6JM9lLUCpXw5ktaaVIKVdkBQlE62aGQ0LphUnh1WnBRIu8x8UFtgQrunMXUtzer4+Corn + GH/xcRbiLEILlMb2KEIau9hTjVCQq+aLtgOvG9mzVRx0dsaozPNgU8J3Uhvv8+mge2JIdUulndGe + rNiWCcK9kmnNxHahxPZkuNKGGJb/gv2OkoLe3LiduWP4ysZ37DeSc/kMCqvuJnEvA51e5s9cuwHc + 7KCGZi4t5Xem3ezrN7BhlBfN87FXHlCBcBpGcYLSIMCB7wfhIxCLk+ZemVhVVPHDysiVXU3UnJ9L + OxCOZjUVmhm2pycUaSUZhzgZ+mJayO2ZZmvGmTnAWNVrDuEDIBKxrcnWIomKBjDsVlAtxrXXoMbr + I+PddPNVxN02sY6xIdLIStZcbseSDdlLOJuhN4VDJrWW25GkrMfzuRSGWvNbiaMVEU7Oidafntzd + PCdV8eSOFYizq+jGTl75VxJtZCGFgiui2jy5p4XqOcTE6WpNv97nYcdWcGnfZvIw3wnI2WiYdnYU + MPzHVQFo49HjhCiIdE6aogdg7erR393WC3Vw7N6OriGmYPxM19o+NdbHqfpN1e9m9StpwQjcmCH5 + zsK80+kQb0c9XnBgk3+ZovbpHD4XGfDK/V1rdpC7nDjCMQzZdgcaO2Bzu88KBQHoMH6cnXgCeitP + wJkfLOIwmXjClClv4gnhMkiWUYrihpvehViEo/+NJxSsorn5PTzh3M2HeMK5ycQTfgNPsMbOphbC + 9voXA7yhui4HE2uYauHEGn6BNeARa2gUfo5N7Gf+MkPxIg2nnxamNHmcMgR+glMc4CSMwiQO7kAs + yJC/QMvgw/20cO3mXcpwbfIOKINg+dRgp8rxHhvsG/pcDy3bfemLgtcC/bOOBuUmaTpaqwdmpqqb + bOGGKT4Ukr0c5Zzfjk/aUg00wDBjzSAkdeWYZ3Dg4F6YI9uDez3NXsxhLpigl2r+8czT46h1+9Fj + L/zj0orjxRKnU/eecvBt3TtEKFomMUbpIxBL0Mf7Y+Dazce695nJO+jeH/+Ff02paj/+shIcEyX1 + n6VDnO8gnJjJVBXfITP5OK/+3/4DAAD//wMAcL5C61ogAAA= headers: Cache-Control: ['no-cache, no-store'] + Content-Encoding: [gzip] Content-Type: [application/json; charset=utf-8] + Link: ['; rel="next", + ; rel="prev"'] Referrer-Policy: [strict-origin-when-cross-origin] - Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] X-Content-Type-Options: [nosniff] X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [93a5beb9-f93d-4498-a0a6-c08258d72d95] - X-Runtime: ['0.229491'] + X-Request-Id: [c803dcde-b4b2-4c79-ad89-8bfd07ec57ae] + X-Runtime: ['0.150857'] X-XSS-Protection: [1; mode=block] - content-length: ['1488'] status: {code: 200, message: OK} - request: body: null @@ -41,32 +54,33 @@ interactions: Connection: [keep-alive] User-Agent: [python-requests/2.18.4] method: GET - uri: http://localhost:3000/api/v1/notifications + uri: http://localhost:3000/api/v1/instance/ response: - body: {string: '[{"id":"112","type":"mention","created_at":"2019-06-22T21:12:41.829Z","account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T12:42:50.096Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":2,"following_count":1,"statuses_count":17,"emojis":[],"fields":[]},"status":{"id":"102317291057725861","created_at":"2019-06-22T21:12:41.706Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost/users/admin/statuses/102317291057725861","url":"http://localhost/@admin/102317291057725861","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"content":"\u003cp\u003e\u003cspan - class=\"h-card\"\u003e\u003ca href=\"http://localhost/@mastodonpy_test\" class=\"u-url - mention\"\u003e@\u003cspan\u003emastodonpy_test\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e - hello!\u003c/p\u003e","reblog":null,"application":{"name":"Mastodon.py test - suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T12:42:50.096Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":2,"following_count":1,"statuses_count":17,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"1234567890123456","username":"mastodonpy_test","url":"http://localhost/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}}]'} + body: + string: !!binary | + H4sIACbooF0AA0yQXU7EMAyE7+Ln0vRnabe5AydAqDKJaQNpEiXO7sNq705KWcSb/WlGM/YNcjQg + wXqFdvWJoQI2bKmwF0zstXcFaUoqmsCmbBIKoA2NPcYLxXTwrp7qtpAcbQJ5g8SRcDNumTHsIdck + hfhLkqemaeBeFRnyjz4nirPy2THI/uA5PUDXlhq+xLoHaYqX17y9u6PLyhz+B4iA6iuJjbRBYTZc + KIkQ6WLo+jRhO+q++1Cncz9MdFZKT22D43M3NDSMuv4MS7nEolvybgT5CuTgrYJIiymH4f6Lgjlm + qkB5x6h4RvXbzWVr798AAAD//wMA7+lJTl0BAAA= headers: - Cache-Control: ['no-cache, no-store'] + Cache-Control: ['max-age=300, public'] + Content-Encoding: [gzip] Content-Type: [application/json; charset=utf-8] - Link: ['; rel="next", - ; rel="prev"'] + Date: ['Fri, 11 Oct 2019 20:37:58 GMT'] + ETag: [W/"ad87f54668db431e5bc3f918c2e6980a"] Referrer-Policy: [strict-origin-when-cross-origin] - Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] X-Content-Type-Options: [nosniff] X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [a381923e-e73f-479f-acea-eae201792ae7] - X-Runtime: ['0.095464'] + X-Request-Id: [c6e9a6fe-e6c0-4fb4-be3f-c946b3c7ab32] + X-Runtime: ['0.028744'] X-XSS-Protection: [1; mode=block] - content-length: ['2089'] status: {code: 200, message: OK} - request: - body: id=112 + body: id=132 headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] @@ -78,49 +92,21 @@ interactions: method: POST uri: http://localhost:3000/api/v1/notifications/dismiss response: - body: {string: '{}'} - headers: - Cache-Control: ['no-cache, no-store'] - Content-Type: [application/json; charset=utf-8] - Referrer-Policy: [strict-origin-when-cross-origin] - Transfer-Encoding: [chunked] - Vary: ['Accept-Encoding, Origin'] - X-Content-Type-Options: [nosniff] - X-Download-Options: [noopen] - X-Frame-Options: [SAMEORIGIN] - X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [6d7d73d4-f824-4b47-805f-1552bc92f7d8] - X-Runtime: ['0.041361'] - X-XSS-Protection: [1; mode=block] - content-length: ['2'] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: ['*/*'] - Accept-Encoding: ['gzip, deflate'] - Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN_2] - Connection: [keep-alive] - Content-Length: ['0'] - User-Agent: [python-requests/2.18.4] - method: DELETE - uri: http://localhost:3000/api/v1/statuses/102317291057725861 - response: - body: {string: '{"id":"102317291057725861","created_at":"2019-06-22T21:12:41.706Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost/users/admin/statuses/102317291057725861","url":"http://localhost/@admin/102317291057725861","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"text":"@mastodonpy_test - hello!","reblog":null,"application":{"name":"Mastodon.py test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T12:42:50.096Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@admin","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":2,"following_count":1,"statuses_count":17,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"1234567890123456","username":"mastodonpy_test","url":"http://localhost/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}'} + body: + string: !!binary | + H4sIACbooF0AA6quBQAAAP//AwBDv6ajAgAAAA== headers: Cache-Control: ['no-cache, no-store'] + Content-Encoding: [gzip] Content-Type: [application/json; charset=utf-8] Referrer-Policy: [strict-origin-when-cross-origin] - Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] X-Content-Type-Options: [nosniff] X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [d8419c44-3f0a-4c22-b486-fe69128ad00a] - X-Runtime: ['0.137253'] + X-Request-Id: [4a767314-d1c1-4872-a9e1-fc3186b4b2a1] + X-Runtime: ['0.031584'] X-XSS-Protection: [1; mode=block] - content-length: ['1281'] status: {code: 200, message: OK} version: 1 -- cgit v1.2.3