mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-12-27 00:09:59 -05:00
7dbb473339
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
51 lines
1.5 KiB
Python
51 lines
1.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright 2016 OpenMarket Ltd
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# 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.
|
|
import os.path
|
|
import shutil
|
|
import tempfile
|
|
from synapse.config.homeserver import HomeServerConfig
|
|
from tests import unittest
|
|
|
|
|
|
class ConfigGenerationTestCase(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
self.dir = tempfile.mkdtemp()
|
|
print self.dir
|
|
self.file = os.path.join(self.dir, "homeserver.yaml")
|
|
|
|
def tearDown(self):
|
|
shutil.rmtree(self.dir)
|
|
|
|
def test_generate_config_generates_files(self):
|
|
HomeServerConfig.load_or_generate_config("", [
|
|
"--generate-config",
|
|
"-c", self.file,
|
|
"--report-stats=yes",
|
|
"-H", "lemurs.win"
|
|
])
|
|
|
|
self.assertSetEqual(
|
|
set([
|
|
"homeserver.yaml",
|
|
"lemurs.win.log.config",
|
|
"lemurs.win.signing.key",
|
|
"lemurs.win.tls.crt",
|
|
"lemurs.win.tls.dh",
|
|
"lemurs.win.tls.key",
|
|
]),
|
|
set(os.listdir(self.dir))
|
|
)
|