From 5beccc080d176a0f6e58316422d6bcb0eac60d6b Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Sat, 21 Nov 2015 11:09:07 -0800 Subject: [PATCH] Test for CLI --webroot-map parsing --- letsencrypt/tests/cli_test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py index e5780b8d2..991446447 100644 --- a/letsencrypt/tests/cli_test.py +++ b/letsencrypt/tests/cli_test.py @@ -341,11 +341,12 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods namespace = cli.prepare_and_parse_args(plugins, long_args) self.assertEqual(namespace.domains, ['example.com', 'another.net']) + def test_parse_webroot(self): + plugins = disco.PluginsRegistry.find_all() webroot_args = ['--webroot', '-d', 'stray.example.com', '-w', '/var/www/example', '-d', 'example.com,www.example.com', '-w', '/var/www/superfluous', '-d', 'superfluo.us', '-d', 'www.superfluo.us'] namespace = cli.prepare_and_parse_args(plugins, webroot_args) - open("/tmp/frogs", "w").write("%r" % namespace) self.assertEqual(namespace.webroot_map, { 'example.com' : '/var/www/example', 'stray.example.com' : '/var/www/example', @@ -353,6 +354,10 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods 'www.superfluo.us' : '/var/www/superfluous', 'superfluo.us' : '/var/www/superfluous'}) + webroot_map_args = ['--webroot-map', '{"eg.com" : "/tmp"}'] + namespace = cli.prepare_and_parse_args(plugins, webroot_map_args) + self.assertEqual(namespace.webroot_map, {u"eg.com" : u"/tmp"}) + @mock.patch('letsencrypt.crypto_util.notAfter') @mock.patch('letsencrypt.cli.zope.component.getUtility') def test_certonly_new_request_success(self, mock_get_utility, mock_notAfter):