58 commits

Author	SHA1	Message	Date
Amber Brown	49af402019	run isort	2018-07-09 16:09:20 +10:00
Adrian Tschira	a1a3c9660f	Make tests py3 compatible ... This is a mixed commit that fixes various small issues * print parentheses * 01 is invalid syntax (it was octal in py2) * [x for i in 1, 2] is invalid syntax * six moves Signed-off-by: Adrian Tschira <nota@notafile.com>	2018-04-16 00:39:32 +02:00
Richard van der Hoff	0211464ba2	Fix broken config UTs ... https://github.com/matrix-org/synapse/pull/2755 broke log-config generation, which in turn broke the unit tests.	2018-01-09 11:28:33 +00:00
Mark Haines	7dbb473339	Add function to load config without generating it ... Renames ``load_config`` to ``load_or_generate_config`` Adds a method called ``load_config`` that just loads the config. The main synapse.app.homeserver will continue to use ``load_or_generate_config`` to retain backwards compat. However new worker processes can use ``load_config`` to load the config avoiding some of the cruft needed to generate the config. As the new ``load_config`` method is expected to be used by new configs it removes support for the legacy commandline overrides that ``load_or_generate_config`` supports	2016-06-09 18:50:38 +01:00
Mark Haines	5e2890bd49	Check that the disable_registration config key is handled correctly	2016-02-22 16:01:29 +00:00
Erik Johnston	78a5482267	Typo	2016-02-09 16:23:11 +00:00
Erik Johnston	13ba8d878c	Fix test	2016-02-09 14:55:21 +00:00
Daniel Wagner-Hall	6a9f1209df	Error if macaroon key is missing from config ... Currently we store all access tokens in the DB, and fall back to that check if we can't validate the macaroon, so our fallback works here, but for guests, their macaroons don't get persisted, so we don't get to find them in the database. Each restart, we generate a new ephemeral key, so guests lose access after each server restart. I tried to fix up the config stuff to be less insane, but gave up, so instead I bolt on yet another piece of custom one-off insanity. Also, add some basic tests for config generation and loading.	2016-02-05 01:58:23 +00:00