From e05e9566c55e20833a2c45fe2ca67e60df009aac Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 2 Feb 2017 12:15:45 -0200 Subject: [test] move server auth tests to its own file --- testing/tests/server/test_config.py | 68 +++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 testing/tests/server/test_config.py (limited to 'testing/tests/server/test_config.py') diff --git a/testing/tests/server/test_config.py b/testing/tests/server/test_config.py new file mode 100644 index 00000000..1241472b --- /dev/null +++ b/testing/tests/server/test_config.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +# test_config.py +# Copyright (C) 2013 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +""" +Tests for server configuration. +""" + +from twisted.trial import unittest +from pkg_resources import resource_filename + +from leap.soledad.server._config import _load_config +from leap.soledad.server._config import CONFIG_DEFAULTS + + +class ConfigurationParsingTest(unittest.TestCase): + + def setUp(self): + self.maxDiff = None + + def test_use_defaults_on_failure(self): + config = _load_config('this file will never exist') + expected = CONFIG_DEFAULTS + self.assertEquals(expected, config) + + def test_security_values_configuration(self): + # given + config_path = resource_filename('test_soledad', + 'fixture_soledad.conf') + # when + config = _load_config(config_path) + + # then + expected = {'members': ['user1', 'user2'], + 'members_roles': ['role1', 'role2'], + 'admins': ['user3', 'user4'], + 'admins_roles': ['role3', 'role3']} + self.assertDictEqual(expected, config['database-security']) + + def test_server_values_configuration(self): + # given + config_path = resource_filename('test_soledad', + 'fixture_soledad.conf') + # when + config = _load_config(config_path) + + # then + expected = {'couch_url': + 'http://soledad:passwd@localhost:5984', + 'create_cmd': + 'sudo -u soledad-admin /usr/bin/create-user-db', + 'admin_netrc': + '/etc/couchdb/couchdb-soledad-admin.netrc', + 'batching': False, + 'blobs': False} + self.assertDictEqual(expected, config['soledad-server']) -- cgit v1.2.3 From 4ae57257fa2d40ceeba1558d995d3514e6f6d6fa Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 2 Feb 2017 12:28:19 -0200 Subject: [test] move server url mapper tests to its own file --- testing/tests/server/test_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing/tests/server/test_config.py') diff --git a/testing/tests/server/test_config.py b/testing/tests/server/test_config.py index 1241472b..133057f5 100644 --- a/testing/tests/server/test_config.py +++ b/testing/tests/server/test_config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # test_config.py -# Copyright (C) 2013 LEAP +# Copyright (C) 2017 LEAP # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- cgit v1.2.3 From 7eb1ffa1d49a7e0016c5980da71151e715abc77a Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 21 Feb 2017 14:16:26 -0300 Subject: [feat] add configurable blobs path in server - Resolves: #8777 --- testing/tests/server/test_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'testing/tests/server/test_config.py') diff --git a/testing/tests/server/test_config.py b/testing/tests/server/test_config.py index 133057f5..d2a8a9de 100644 --- a/testing/tests/server/test_config.py +++ b/testing/tests/server/test_config.py @@ -64,5 +64,6 @@ class ConfigurationParsingTest(unittest.TestCase): 'admin_netrc': '/etc/couchdb/couchdb-soledad-admin.netrc', 'batching': False, - 'blobs': False} + 'blobs': False, + 'blobs_path': '/srv/leap/soledad/blobs'} self.assertDictEqual(expected, config['soledad-server']) -- cgit v1.2.3