Merge branch 'master' into eric/msc2716-backfilling-history

Conflicts:
	dockerfiles/synapse/workers-shared.yaml
	internal/client/client.go
	tests/msc2403_test.go

Author: MadLittleMods

ONBOARDING.md

@@ -78,7 +78,7 @@ Get a Federation client:
 // automatically maps localhost:12345 to the right container
 // automatically signs requests
 // srv == federation.Server
-fedClient := srv.FederationClient(deployment, "hs1")
+fedClient := srv.FederationClient(deployment)
 ```
 
 ## FAQ

README.md

@@ -66,6 +66,25 @@ If you're looking to run against a custom Dockerfile, it must meet the following
 
 To get started developing Complement tests, see [the onboarding documentation](ONBOARDING.md).
 
+### Build tags
+
+Complement uses build tags to include or exclude tests for each homeserver. Build tags are comments at the top of the file that look
+like:
+```go
+// +build msc2403
+```
+We have tags for MSCs (the above is in `msc2403_test.go`) as well as general blacklists for a homeserver implementation e.g Dendrite,
+which has the name `dendrite_blacklist`. These are implemented as inverted tags such that specifying the tag results in the file not
+being picked up by `go test`. For example, `apidoc_presence_test.go` has:
+```go
+// +build !dendrite_blacklist
+```
+and all Dendrite tests run with `-tags="dendrite_blacklist"` to cause this file to be skipped. You can run tests with build tags like this:
+```
+COMPLEMENT_BASE_IMAGE=complement-synapse:latest go test -v -tags="synapse_blacklist,msc2403" ./tests
+```
+This runs Complement with a Synapse HS and ignores tests which Synapse doesn't implement, and includes tests for MSC2403.
+
 ## Why 'Complement'?
 
 Because **M**<sup>*C*</sup> = **1** - **M**
@@ -113,21 +132,26 @@ $ go run sytest_coverage.go -v
 10apidoc/01request-encoding 1/1 tests
     ✓ POST rejects invalid utf-8 in JSON
 
-10apidoc/02login 3/6 tests
+10apidoc/02login 6/6 tests
     ✓ GET /login yields a set of flows
     ✓ POST /login can log in as a user
     ✓ POST /login returns the same device_id as that in the request
-    × POST /login can log in as a user with just the local part of the id
-    × POST /login as non-existing user is rejected
-    × POST /login wrong password is rejected
+    ✓ POST /login can log in as a user with just the local part of the id
+    ✓ POST /login as non-existing user is rejected
+    ✓ POST /login wrong password is rejected
 
 10apidoc/03events-initial 0/2 tests
-10apidoc/04version 0/1 tests
+10apidoc/04version 1/1 tests
+    ✓ Version responds 200 OK with valid structure
+
 10apidoc/10profile-displayname 0/2 tests
 10apidoc/11profile-avatar_url 0/2 tests
 10apidoc/12device_management 0/8 tests
 10apidoc/13ui-auth 0/4 tests
-10apidoc/20presence 0/2 tests
+10apidoc/20presence 2/2 tests
+    ✓ GET /presence/:user_id/status fetches initial status
+    ✓ PUT /presence/:user_id/status updates my presence
+
 10apidoc/30room-create 0/10 tests
 10apidoc/31room-state 0/14 tests
 10apidoc/32room-alias 0/2 tests
@@ -143,8 +167,21 @@ $ go run sytest_coverage.go -v
 12login/01threepid-and-password 0/1 tests
 12login/02cas 0/3 tests
 13logout 0/4 tests
-14account/01change-password 0/7 tests
-14account/02deactivate 0/4 tests
+14account/01change-password 5/7 tests
+    ✓ After changing password, can't log in with old password
+    ✓ After changing password, can log in with new password
+    ✓ After changing password, existing session still works
+    ✓ After changing password, a different session no longer works by default
+    ✓ After changing password, different sessions can optionally be kept
+    × Pushers created with a different access token are deleted on password change
+    × Pushers created with a the same access token are not deleted on password change
+
+14account/02deactivate 3/4 tests
+    ✓ Can deactivate account
+    ✓ Can't deactivate account with wrong password
+    ✓ After deactivating account, can't log in with password
+    × After deactivating account, can't log in with an email
+
 21presence-events 0/3 tests
 30rooms/01state 2/9 tests
     ✓ Room creation reports m.room.create to myself
@@ -183,7 +220,10 @@ $ go run sytest_coverage.go -v
 30rooms/52members 0/3 tests
 30rooms/60version_upgrade 0/19 tests
 30rooms/70publicroomslist 0/5 tests
-31sync/01filter 0/2 tests
+31sync/01filter 2/2 tests
+    ✓ Can create filter
+    ✓ Can download filter
+
 31sync/02sync 0/1 tests
 31sync/03joined 0/6 tests
 31sync/04timeline 0/8 tests
@@ -310,5 +350,5 @@ $ go run sytest_coverage.go -v
 90jira/SYN-516 0/1 tests
 90jira/SYN-627 0/1 tests
 
-TOTAL: 15/690 tests converted
+TOTAL: 31/690 tests converted
 ```

dockerfiles/SynapseWorkers.Dockerfile

@@ -1,6 +1,6 @@
 # This dockerfile builds on top of Dockerfile-worker and includes a built-in postgres instance
 # as well as sets up the homeserver so that it is ready for testing via Complement
-FROM matrixdotorg/synapse:workers
+FROM matrixdotorg/synapse-workers
 
 # Download a caddy server to stand in front of nginx and terminate TLS using Complement's
 # custom CA.
@@ -25,7 +25,7 @@ RUN pg_ctlcluster 11 main start &&  su postgres -c "echo \
 # and the disabling of rate-limiting
 COPY synapse/workers-shared.yaml /conf/workers/shared.yaml
 
-WORKDIR /root
+WORKDIR /data
 
 # Copy the caddy config
 COPY synapse/caddy.complement.json /root/caddy.json
@@ -46,8 +46,21 @@ ENTRYPOINT \
   SYNAPSE_REPORT_STATS=no \
   # Set postgres authentication details which will be placed in the homeserver config file
   POSTGRES_PASSWORD=somesecret POSTGRES_USER=postgres POSTGRES_HOST=localhost \
-  # Use all available worker types
-  SYNAPSE_WORKERS=* \
+  # Specify the workers to test with
+  SYNAPSE_WORKER_TYPES="\
+    event_persister, \
+    event_persister, \
+    background_worker, \
+    frontend_proxy, \
+    event_creator, \
+    user_dir, \
+    media_repository, \
+    federation_inbound, \
+    federation_reader, \
+    federation_sender, \
+    synchrotron, \
+    appservice, \
+    pusher" \
   # Run the script that writes the necessary config files and starts supervisord, which in turn
   # starts everything else
   /configure_workers_and_start.py

dockerfiles/synapse/workers-shared.yaml

@@ -66,3 +66,5 @@ experimental_features:
   msc2403_enabled: true
   # Enable history backfilling support
   msc2716_enabled: true
+  # Enable spaces support
+  spaces_enabled: true