From e2e7acf4c4ff5c74a7f0098245b6702b38abaaf7 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Sat, 17 Oct 2015 16:30:54 -0700 Subject: [PATCH] Use actual CSR path --- letsencrypt/cli.py | 4 ++-- letsencrypt/tests/cli_test.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index 39fc721c7..da6bbeeab 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -377,9 +377,9 @@ def auth(args, config, plugins): if args.csr is not None: certr, chain = le_client.obtain_certificate_from_csr(le_util.CSR( file=args.csr[0], data=args.csr[1], form="der")) - le_client.save_certificate( + cert_path, _ = le_client.save_certificate( certr, chain, args.cert_path, args.chain_path) - _report_new_cert(args.cert_path) + _report_new_cert(cert_path) else: domains = _find_domains(args, installer) _auth_from_domains(le_client, config, domains, plugins) diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py index 548e23972..870359824 100644 --- a/letsencrypt/tests/cli_test.py +++ b/letsencrypt/tests/cli_test.py @@ -187,6 +187,7 @@ class CLITest(unittest.TestCase): mock_client = mock.MagicMock() mock_client.obtain_certificate_from_csr.return_value = ('certr', 'chain') + mock_client.save_certificate.return_value = cert_path, None mock_init.return_value = mock_client installer = 'installer'