From 4dc5c0462bf793f8d5bf1e8a364c8f65e281b7cf Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Thu, 28 Jan 2016 17:14:55 -0800 Subject: [PATCH] Test setting webroot-path in a config file --- letsencrypt/tests/cli_test.py | 7 +++++-- letsencrypt/tests/testdata/webrootconftest.ini | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 letsencrypt/tests/testdata/webrootconftest.ini diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py index ee135825d..ac600a357 100644 --- a/letsencrypt/tests/cli_test.py +++ b/letsencrypt/tests/cli_test.py @@ -383,9 +383,9 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods self.assertRaises(errors.Error, cli.prepare_and_parse_args, plugins, short_args) def _webroot_map_test(self, map_arg, path_arg, domains_arg, - expected_map, expectect_domains): + expected_map, expectect_domains, extra_args=[]): plugins = disco.PluginsRegistry.find_all() - webroot_map_args = [] + webroot_map_args = [] + extra_args if map_arg: webroot_map_args.extend(["--webroot-map", map_arg]) if path_arg: @@ -427,6 +427,9 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods expected_map[u"eg2.com"] = u"/tmp" self._webroot_map_test(None, "/tmp", None, expected_map, domains) + extra_args = ['-c', test_util.vector_path('webrootconftest.ini')] + self._webroot_map_test(None, None, None, expected_map, domains, extra_args) + @mock.patch('letsencrypt.cli._suggest_donate') @mock.patch('letsencrypt.crypto_util.notAfter') diff --git a/letsencrypt/tests/testdata/webrootconftest.ini b/letsencrypt/tests/testdata/webrootconftest.ini new file mode 100644 index 000000000..de3bd98a6 --- /dev/null +++ b/letsencrypt/tests/testdata/webrootconftest.ini @@ -0,0 +1,3 @@ +webroot +webroot-path = /tmp +domains = eg.com, eg2.com