Mock out get/put with awaitables in tests

tests/__init__.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, TypeVar
 from unittest.mock import Mock
 
 import attr
@@ -43,6 +43,13 @@ def membership(self) -> str:
         return membership
 
 
+T = TypeVar("T")
+
+
+async def make_awaitable(value: T) -> T:
+    return value
+
+
 def create_module(config_override: Dict[str, Any] = {}) -> InviteAutoAccepter:
     # Create a mock based on the ModuleApi spec, but override some mocked functions
     # because some capabilities are needed for running the tests.
@@ -51,9 +58,6 @@ def create_module(config_override: Dict[str, Any] = {}) -> InviteAutoAccepter:
 
     # Python 3.6 doesn't support awaiting on a mock, so we make it return an awaitable
     # value.
-    async def make_awaitable(result: Any) -> Any:
-        return result
-
     module_api.update_room_membership.return_value = make_awaitable(None)
     config = InviteAutoAccepter.parse_config(config_override)
 

tests/test_accept_invite.py

@@ -17,7 +17,7 @@
 import aiounittest
 
 from synapse_auto_accept_invite import InviteAutoAccepter
-from tests import MockEvent, create_module
+from tests import MockEvent, create_module, make_awaitable
 
 
 class InviteAutoAccepterTestCase(aiounittest.AsyncTestCase):
@@ -72,13 +72,16 @@ async def test_accept_invite_direct_message(self) -> None:
         account_data_put: Mock = cast(
             Mock, self.module._api.account_data_manager.put_global
         )
+        account_data_put.return_value = make_awaitable(None)
+
         account_data_get: Mock = cast(
             Mock, self.module._api.account_data_manager.get_global
         )
-
-        account_data_get.return_value = {
-            "@someone:random": ["!somewhere:random"],
-        }
+        account_data_get.return_value = make_awaitable(
+            {
+                "@someone:random": ["!somewhere:random"],
+            }
+        )
 
         # Stop mypy from complaining that we give on_new_event a MockEvent rather than an
         # EventBase.
@@ -175,6 +178,13 @@ async def test_accept_invite_direct_message_if_only_enabled_for_direct_messages(
             config_override={"accept_invites_only_for_direct_messages": True},
         )
 
+        # Patch out the account data get and put methods with dummy awaitables.
+        account_data_put: Mock = cast(Mock, module._api.account_data_manager.put_global)
+        account_data_put.return_value = make_awaitable(None)
+
+        account_data_get: Mock = cast(Mock, module._api.account_data_manager.get_global)
+        account_data_get.return_value = make_awaitable({})
+
         invite = MockEvent(
             sender=self.user_id,
             state_key=self.invitee,