aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhalcy <halcy@ARARAGI-KUN>2022-11-13 18:39:56 +0200
committerhalcy <halcy@ARARAGI-KUN>2022-11-13 18:39:56 +0200
commit5215c2242dd7b87418a7c10781c2b10b35d86f46 (patch)
tree9164c3963424cc149ddd7e61561470f27f5b817a /tests/test_admin.py
parent0e00fced99976d74e972a3c9ca5b762697840a33 (diff)
downloadmastodon.py-5215c2242dd7b87418a7c10781c2b10b35d86f46.tar.gz
Fix some things in streaming and admin API for 3.3.0 support
Diffstat (limited to 'tests/test_admin.py')
-rw-r--r--tests/test_admin.py26
1 files changed, 24 insertions, 2 deletions
diff --git a/tests/test_admin.py b/tests/test_admin.py
index 1cc1865..f62b96b 100644
--- a/tests/test_admin.py
+++ b/tests/test_admin.py
@@ -14,7 +14,7 @@ def test_admin_accounts(api2):
14 assert(account_admin) 14 assert(account_admin)
15 assert(account_admin.id == account_self.id) 15 assert(account_admin.id == account_self.id)
16 16
17@pytest.mark.vcr() 17@pytest.mark.vcr(match_on=['path'])
18def test_admin_moderation(api, api2): 18def test_admin_moderation(api, api2):
19 account_initial = api.account_verify_credentials() 19 account_initial = api.account_verify_credentials()
20 account = account_initial 20 account = account_initial
@@ -34,6 +34,25 @@ def test_admin_moderation(api, api2):
34 account = api2.admin_account_unsilence(account) 34 account = api2.admin_account_unsilence(account)
35 assert(not account.silenced) 35 assert(not account.silenced)
36 36
37 api2.admin_account_moderate(account, "sensitive")
38 account = api2.admin_account(account_initial)
39 image = api.media_post('tests/image.jpg')
40 assert image
41 status = api.status_post("oh no!", media_ids=image, sensitive=False)
42 assert status
43 status = api2.status(status)
44 assert status.sensitive
45 api.status_delete(status)
46
47 account = api2.admin_account_unsensitive(account)
48 image = api.media_post('tests/image.jpg')
49 assert image
50 status = api.status_post("oh no!", media_ids=image, sensitive=False)
51 assert status
52 status = api2.status(status)
53 assert not status.sensitive
54 api.status_delete(status)
55
37 api2.admin_account_moderate(account, "suspend") 56 api2.admin_account_moderate(account, "suspend")
38 account = api2.admin_account(account_initial) 57 account = api2.admin_account(account_initial)
39 assert(account.suspended) 58 assert(account.suspended)
@@ -53,7 +72,10 @@ def test_admin_moderation(api, api2):
53 api2.admin_account_unsilence(account) 72 api2.admin_account_unsilence(account)
54 except: 73 except:
55 pass 74 pass
56 time.sleep(4) 75 try:
76 api.status_delete(status)
77 except:
78 pass
57 79
58@pytest.mark.vcr() 80@pytest.mark.vcr()
59def test_admin_reports(api, api2, status): 81def test_admin_reports(api, api2, status):
Powered by cgit v1.2.3 (git 2.41.0)