diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index 77ac9be37..471f4a2fd 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -865,6 +865,8 @@ def _renewal_conf_files(config): return glob.glob(os.path.join(config.renewal_configs_dir, "*.conf")) def _copy_nsconfig(config): + # Work around https://bugs.python.org/issue1515 for py26 tests :( :( + # https://travis-ci.org/letsencrypt/letsencrypt/jobs/106900743#L3276 ns = copy.deepcopy(config.namespace) new_config = configuration.NamespaceConfig(ns) return new_config diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py index 393531c6e..a5757399e 100644 --- a/letsencrypt/tests/cli_test.py +++ b/letsencrypt/tests/cli_test.py @@ -603,11 +603,7 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods print lf.read() - # Work around https://bugs.python.org/issue1515 for py26 tests :( :( - # https://travis-ci.org/letsencrypt/letsencrypt/jobs/106900743#L3276 - @mock.patch('letsencrypt.cli.copy.deepcopy') - def test_renewal_verb(self, hack_copy): - + def test_renewal_verb(self): with open(test_util.vector_path('sample-renewal.conf')) as src: # put the correct path for cert.pem, chain.pem etc in the renewal conf renewal_conf = src.read().replace("MAGICDIR", test_util.vector_path()) @@ -616,7 +612,6 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods rc = os.path.join(rd, "sample-renewal.conf") with open(rc, "w") as dest: dest.write(renewal_conf) - hack_copy.side_effect = lambda x: x args = ["renew", "--dry-run", "-tvv"] self._test_renewal_common(True, [], args=args, renew=True)