From 8b234fb2163a264bd38951ae3a16c39c6b207bf1 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Fri, 18 Sep 2020 11:37:21 +0100
Subject: Swap method calls in RoomAccessTestCase.test_change_rules (#64)

Swap these calls around, as the check for changing `restricted` to `unrestricted` will actually change `self.restricted_room` to an unrestricted room.

Do that last, instead of first. Additionally add a comment with a warning.
---
 tests/rest/client/test_room_access_rules.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/rest/client/test_room_access_rules.py b/tests/rest/client/test_room_access_rules.py
index ae59f8f911..6582cd288d 100644
--- a/tests/rest/client/test_room_access_rules.py
+++ b/tests/rest/client/test_room_access_rules.py
@@ -518,18 +518,19 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
         """Tests that we can only change the current rule from restricted to
         unrestricted.
         """
+        # We can't change the rule from restricted to direct.
+        self.change_rule_in_room(
+            room_id=self.restricted_room, new_rule=AccessRules.DIRECT, expected_code=403
+        )
+
         # We can change the rule from restricted to unrestricted.
+        # Note that this changes self.restricted_room to an unrestricted room
         self.change_rule_in_room(
             room_id=self.restricted_room,
             new_rule=AccessRules.UNRESTRICTED,
             expected_code=200,
         )
 
-        # We can't change the rule from restricted to direct.
-        self.change_rule_in_room(
-            room_id=self.restricted_room, new_rule=AccessRules.DIRECT, expected_code=403
-        )
-
         # We can't change the rule from unrestricted to restricted.
         self.change_rule_in_room(
             room_id=self.unrestricted_room,
-- 
cgit 1.5.1