From 68f46e07f2bab943051f46c03912946ade2edea9 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Fri, 15 May 2020 15:14:33 +0100
Subject: [PATCH] Fix sytest CI

* Switch sytest-synapse to sytest-dinsic
* Be sure to invalidate our caches properly!
* Remove duplicate encryption state key definition
* Remove old config option name in comment
* Make dinsic the default in merge_base_branch
---
 .buildkite/merge_base_branch.sh             |  2 +-
 .buildkite/pipeline.yml                     | 10 +++++-----
 synapse/api/constants.py                    |  1 -
 synapse/handlers/profile.py                 |  2 +-
 synapse/handlers/room.py                    |  2 +-
 synapse/storage/data_stores/main/profile.py |  6 ++++++
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.buildkite/merge_base_branch.sh b/.buildkite/merge_base_branch.sh
index 361440fd1a..d0a7aef8cb 100755
--- a/.buildkite/merge_base_branch.sh
+++ b/.buildkite/merge_base_branch.sh
@@ -12,7 +12,7 @@ if [[ -z $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]]; then
 
     # It probably hasn't had a PR opened yet. Since all PRs land on develop, we
     # can probably assume it's based on it and will be merged into it.
-    GITBASE="develop"
+    GITBASE="dinsic"
 else
     # Get the reference, using the GitHub API
     GITBASE=$BUILDKITE_PULL_REQUEST_BASE_BRANCH
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 85b34f73a4..5877ff0883 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -252,7 +252,7 @@ steps:
       - "bash /bootstrap.sh synapse"
     plugins:
       - docker#v3.0.1:
-          image: "matrixdotorg/sytest-synapse:py35"
+          image: "matrixdotorg/sytest-synapse:dinsic"
           propagate-environment: true
           always-pull: true
           workdir: "/src"
@@ -285,7 +285,7 @@ steps:
       - "bash /bootstrap.sh synapse"
     plugins:
       - docker#v3.0.1:
-          image: "matrixdotorg/sytest-synapse:py35"
+          image: "matrixdotorg/sytest-synapse:dinsic"
           propagate-environment: true
           always-pull: true
           workdir: "/src"
@@ -322,7 +322,7 @@ steps:
       - "bash /bootstrap.sh synapse"
     plugins:
       - docker#v3.0.1:
-          image: "matrixdotorg/sytest-synapse:py35"
+          image: "matrixdotorg/sytest-synapse:dinsic"
           propagate-environment: true
           always-pull: true
           workdir: "/src"
@@ -356,7 +356,7 @@ steps:
       - "bash /bootstrap.sh synapse"
     plugins:
       - docker#v3.0.1:
-          image: "matrixdotorg/sytest-synapse:py38"
+          image: "matrixdotorg/sytest-synapse:dinsic"
           propagate-environment: true
           always-pull: true
           workdir: "/src"
@@ -393,7 +393,7 @@ steps:
       - "bash /bootstrap.sh synapse"
     plugins:
       - docker#v3.0.1:
-          image: "matrixdotorg/sytest-synapse:py37"
+          image: "matrixdotorg/sytest-synapse:dinsic"
           propagate-environment: true
           always-pull: true
           workdir: "/src"
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 42eff8793b..cc8577552b 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -85,7 +85,6 @@ class EventTypes(object):
     RoomAvatar = "m.room.avatar"
     RoomEncryption = "m.room.encryption"
     GuestAccess = "m.room.guest_access"
-    Encryption = "m.room.encryption"
 
     # These are used for validation
     Message = "m.room.message"
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py
index 824fadf028..e800504ea6 100644
--- a/synapse/handlers/profile.py
+++ b/synapse/handlers/profile.py
@@ -493,7 +493,7 @@ class BaseProfileHandler(BaseHandler):
     @defer.inlineCallbacks
     def check_profile_query_allowed(self, target_user, requester=None):
         """Checks whether a profile query is allowed. If the
-        'limit_profile_requests_to_known_users' config flag is set to True and a
+        'require_auth_for_profile_requests' config flag is set to True and a
         'requester' is provided, the query is only allowed if the two users
         share a room.
 
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index b13a2b94b6..ee9fc296e1 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -875,7 +875,7 @@ class RoomCreationHandler(BaseHandler):
 
         if "encryption_alg" in config:
             yield send(
-                etype=EventTypes.Encryption,
+                etype=EventTypes.RoomEncryption,
                 state_key="",
                 content={"algorithm": config["encryption_alg"]},
             )
diff --git a/synapse/storage/data_stores/main/profile.py b/synapse/storage/data_stores/main/profile.py
index f438dd38be..2a97991d23 100644
--- a/synapse/storage/data_stores/main/profile.py
+++ b/synapse/storage/data_stores/main/profile.py
@@ -126,6 +126,9 @@ class ProfileWorkerStore(SQLBaseStore):
         )
 
     def set_profile_displayname(self, user_localpart, new_displayname, batchnum):
+        # Invalidate the read cache for this user
+        self.get_profile_displayname.invalidate((user_localpart,))
+
         return self.db.simple_upsert(
             table="profiles",
             keyvalues={"user_id": user_localpart},
@@ -135,6 +138,9 @@ class ProfileWorkerStore(SQLBaseStore):
         )
 
     def set_profile_avatar_url(self, user_localpart, new_avatar_url, batchnum):
+        # Invalidate the read cache for this user
+        self.get_profile_avatar_url.invalidate((user_localpart,))
+
         return self.db.simple_upsert(
             table="profiles",
             keyvalues={"user_id": user_localpart},