Skip to content

Commit bd70ffd

Browse files
dklimpeldklimpel
committed
update test response code, introduced in matrix-org#11228 
1 parent 3b3cf2a commit bd70ffd

File tree

1 file changed

+32
-24
lines changed

1 file changed

+32
-24
lines changed

‎tests/rest/admin/test_room.py

+32-24
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ def test_requester_is_no_admin(self, method: str, url: str):
512512
access_token=self.other_user_tok,
513513
)
514514

515-
self.assertEqual(403, channel.code, msg=channel.json_body)
515+
self.assertEqual(HTTPStatus.FORBIDDEN, channel.code, msg=channel.json_body)
516516
self.assertEqual(Codes.FORBIDDEN, channel.json_body["errcode"])
517517

518518
@parameterized.expand(
@@ -534,7 +534,7 @@ def test_room_does_not_exist(self, method: str, url: str):
534534
access_token=self.admin_user_tok,
535535
)
536536

537-
self.assertEqual(404, channel.code, msg=channel.json_body)
537+
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body)
538538
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
539539

540540
@parameterized.expand(
@@ -555,7 +555,7 @@ def test_room_is_not_valid(self, method: str, url: str):
555555
access_token=self.admin_user_tok,
556556
)
557557

558-
self.assertEqual(400, channel.code, msg=channel.json_body)
558+
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
559559
self.assertEqual(
560560
"invalidroom is not a legal room ID",
561561
channel.json_body["error"],
@@ -573,7 +573,7 @@ def test_new_room_user_does_not_exist(self):
573573
access_token=self.admin_user_tok,
574574
)
575575

576-
self.assertEqual(200, channel.code, msg=channel.json_body)
576+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
577577
self.assertIn("purge_id", channel.json_body)
578578
purge_id = channel.json_body["purge_id"]
579579

@@ -591,7 +591,7 @@ def test_new_room_user_is_not_local(self):
591591
access_token=self.admin_user_tok,
592592
)
593593

594-
self.assertEqual(400, channel.code, msg=channel.json_body)
594+
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
595595
self.assertEqual(
596596
"User must be our own: @not:exist.bla",
597597
channel.json_body["error"],
@@ -609,7 +609,7 @@ def test_block_is_not_bool(self):
609609
access_token=self.admin_user_tok,
610610
)
611611

612-
self.assertEqual(400, channel.code, msg=channel.json_body)
612+
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
613613
self.assertEqual(Codes.BAD_JSON, channel.json_body["errcode"])
614614

615615
def test_purge_is_not_bool(self):
@@ -624,7 +624,7 @@ def test_purge_is_not_bool(self):
624624
access_token=self.admin_user_tok,
625625
)
626626

627-
self.assertEqual(400, channel.code, msg=channel.json_body)
627+
self.assertEqual(HTTPStatus.BAD_REQUEST, channel.code, msg=channel.json_body)
628628
self.assertEqual(Codes.BAD_JSON, channel.json_body["errcode"])
629629

630630
def test_delete_expired_status(self):
@@ -638,7 +638,7 @@ def test_delete_expired_status(self):
638638
access_token=self.admin_user_tok,
639639
)
640640

641-
self.assertEqual(200, channel.code, msg=channel.json_body)
641+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
642642
self.assertIn("purge_id", channel.json_body)
643643
purge_id1 = channel.json_body["purge_id"]
644644

@@ -653,7 +653,7 @@ def test_delete_expired_status(self):
653653
access_token=self.admin_user_tok,
654654
)
655655

656-
self.assertEqual(200, channel.code, msg=channel.json_body)
656+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
657657
self.assertIn("purge_id", channel.json_body)
658658
purge_id2 = channel.json_body["purge_id"]
659659

@@ -664,7 +664,7 @@ def test_delete_expired_status(self):
664664
access_token=self.admin_user_tok,
665665
)
666666

667-
self.assertEqual(200, channel.code, msg=channel.json_body)
667+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
668668
self.assertEqual(2, len(channel.json_body["results"]))
669669
self.assertEqual("complete", channel.json_body["results"][0]["status"])
670670
self.assertEqual("complete", channel.json_body["results"][1]["status"])
@@ -681,7 +681,7 @@ def test_delete_expired_status(self):
681681
access_token=self.admin_user_tok,
682682
)
683683

684-
self.assertEqual(200, channel.code, msg=channel.json_body)
684+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
685685
self.assertEqual(1, len(channel.json_body["results"]))
686686
self.assertEqual("complete", channel.json_body["results"][0]["status"])
687687
self.assertEqual(purge_id2, channel.json_body["results"][0]["purge_id"])
@@ -695,7 +695,7 @@ def test_delete_expired_status(self):
695695
access_token=self.admin_user_tok,
696696
)
697697

698-
self.assertEqual(404, channel.code, msg=channel.json_body)
698+
self.assertEqual(HTTPStatus.NOT_FOUND, channel.code, msg=channel.json_body)
699699
self.assertEqual(Codes.NOT_FOUND, channel.json_body["errcode"])
700700

701701
def test_delete_same_room_twice(self):
@@ -721,7 +721,7 @@ def test_delete_same_room_twice(self):
721721
access_token=self.admin_user_tok,
722722
)
723723

724-
self.assertEqual(400, second_channel.code, msg=second_channel.json_body)
724+
self.assertEqual(HTTPStatus.BAD_REQUEST, second_channel.code, msg=second_channel.json_body)
725725
self.assertEqual(Codes.UNKNOWN, second_channel.json_body["errcode"])
726726
self.assertEqual(
727727
f"History purge already in progress for {self.room_id}",
@@ -730,7 +730,7 @@ def test_delete_same_room_twice(self):
730730

731731
# get result of first call
732732
first_channel.await_result()
733-
self.assertEqual(200, first_channel.code, msg=first_channel.json_body)
733+
self.assertEqual(HTTPStatus.OK, first_channel.code, msg=first_channel.json_body)
734734
self.assertIn("purge_id", first_channel.json_body)
735735

736736
# check status after finish the task
@@ -761,7 +761,7 @@ def test_purge_room_and_block(self):
761761
access_token=self.admin_user_tok,
762762
)
763763

764-
self.assertEqual(200, channel.code, msg=channel.json_body)
764+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
765765
self.assertIn("purge_id", channel.json_body)
766766
purge_id = channel.json_body["purge_id"]
767767

@@ -792,7 +792,7 @@ def test_purge_room_and_not_block(self):
792792
access_token=self.admin_user_tok,
793793
)
794794

795-
self.assertEqual(200, channel.code, msg=channel.json_body)
795+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
796796
self.assertIn("purge_id", channel.json_body)
797797
purge_id = channel.json_body["purge_id"]
798798

@@ -824,7 +824,7 @@ def test_block_room_and_not_purge(self):
824824
access_token=self.admin_user_tok,
825825
)
826826

827-
self.assertEqual(200, channel.code, msg=channel.json_body)
827+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
828828
self.assertIn("purge_id", channel.json_body)
829829
purge_id = channel.json_body["purge_id"]
830830

@@ -870,7 +870,7 @@ def test_shutdown_room_consent(self):
870870
access_token=self.admin_user_tok,
871871
)
872872

873-
self.assertEqual(200, channel.code, msg=channel.json_body)
873+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
874874
self.assertIn("purge_id", channel.json_body)
875875
purge_id = channel.json_body["purge_id"]
876876

@@ -881,7 +881,7 @@ def test_shutdown_room_consent(self):
881881
self.url_status_by_room_id,
882882
access_token=self.admin_user_tok,
883883
)
884-
self.assertEqual(200, channel.code, msg=channel.json_body)
884+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
885885
self.assertEqual(1, len(channel.json_body["results"]))
886886

887887
# Test that member has moved to new room
@@ -908,7 +908,7 @@ def test_shutdown_room_block_peek(self):
908908
content={"history_visibility": "world_readable"},
909909
access_token=self.other_user_tok,
910910
)
911-
self.assertEqual(200, channel.code, msg=channel.json_body)
911+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
912912

913913
# Test that room is not purged
914914
with self.assertRaises(AssertionError):
@@ -925,7 +925,7 @@ def test_shutdown_room_block_peek(self):
925925
access_token=self.admin_user_tok,
926926
)
927927

928-
self.assertEqual(200, channel.code, msg=channel.json_body)
928+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
929929
self.assertIn("purge_id", channel.json_body)
930930
purge_id = channel.json_body["purge_id"]
931931

@@ -936,7 +936,7 @@ def test_shutdown_room_block_peek(self):
936936
self.url_status_by_room_id,
937937
access_token=self.admin_user_tok,
938938
)
939-
self.assertEqual(200, channel.code, msg=channel.json_body)
939+
self.assertEqual(HTTPStatus.OK, channel.code, msg=channel.json_body)
940940
self.assertEqual(1, len(channel.json_body["results"]))
941941

942942
# Test that member has moved to new room
@@ -1020,7 +1020,11 @@ def _test_result(
10201020
self.url_status_by_room_id,
10211021
access_token=self.admin_user_tok,
10221022
)
1023-
self.assertEqual(200, channel_room_id.code, msg=channel_room_id.json_body)
1023+
self.assertEqual(
1024+
HTTPStatus.OK,
1025+
channel_room_id.code,
1026+
msg=channel_room_id.json_body
1027+
)
10241028
self.assertEqual(1, len(channel_room_id.json_body["results"]))
10251029
self.assertEqual(purge_id, channel_room_id.json_body["results"][0]["purge_id"])
10261030

@@ -1030,7 +1034,11 @@ def _test_result(
10301034
self.url_status_by_purge_id + purge_id,
10311035
access_token=self.admin_user_tok,
10321036
)
1033-
self.assertEqual(200, channel_purge_id.code, msg=channel_purge_id.json_body)
1037+
self.assertEqual(
1038+
HTTPStatus.OK,
1039+
channel_purge_id.code,
1040+
msg=channel_purge_id.json_body,
1041+
)
10341042

10351043
# test values that are the same in both responses
10361044
for content in [

0 commit comments

Comments
 (0)