Merge remote-tracking branch 'origin/master' into kuba_chain

.pylintrc

@@ -38,7 +38,7 @@ load-plugins=linter_plugin
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=fixme,locally-disabled,abstract-class-not-used,bad-continuation,too-few-public-methods,no-self-use,duplicate-code
+disable=fixme,locally-disabled,abstract-class-not-used,bad-continuation,too-few-public-methods,no-self-use
 # abstract-class-not-used cannot be disabled locally (at least in pylint 1.4.1)
 
 

letsencrypt/cli.py

@@ -236,7 +236,7 @@ def run(args, config, plugins):  # pylint: disable=too-many-branches,too-many-lo
                 "You have an existing certificate that contains exactly the "
                 "same domains you requested (ref: {0})\n\nDo you want to "
                 "renew and replace this certificate with a newly-issued one?"
-                ).format(identical_names_cert.configfile.filename)
+            ).format(identical_names_cert.configfile.filename)
         elif subset_names_cert is not None:
             question = (
                 "You have an existing certificate that contains a portion of "
@@ -244,9 +244,9 @@ def run(args, config, plugins):  # pylint: disable=too-many-branches,too-many-lo
                 "names: {1}\n\nYou requested these names for the new "
                 "certificate: {2}.\n\nDo you want to replace this existing "
                 "certificate with the new certificate?"
-                ).format(subset_names_cert.configfile.filename,
-                         ", ".join(subset_names_cert.names()),
-                         ", ".join(domains))
+            ).format(subset_names_cert.configfile.filename,
+                     ", ".join(subset_names_cert.names()),
+                     ", ".join(domains))
         if question is None:
             # We aren't in a duplicative-names situation at all, so we don't
             # have to tell or ask the user anything about this.
@@ -256,13 +256,13 @@ def run(args, config, plugins):  # pylint: disable=too-many-branches,too-many-lo
             treat_as_renewal = True
         else:
             reporter_util = zope.component.getUtility(interfaces.IReporter)
-            reporter_util.add_message((
+            reporter_util.add_message(
                 "To obtain a new certificate that {0} an existing certificate "
                 "in its domain-name coverage, you must use the --duplicate "
-                "option.\n\nFor example:\n\n{1} --duplicate {2}").format(
+                "option.\n\nFor example:\n\n{1} --duplicate {2}".format(
                     "duplicates" if identical_names_cert is not None else
                     "overlaps with", sys.argv[0], " ".join(sys.argv[1:])),
-                                      reporter_util.HIGH_PRIORITY)
+                reporter_util.HIGH_PRIORITY)
             return 1
 
     # Attempting to obtain the certificate
@@ -794,7 +794,7 @@ def _setup_logging(args):
     # TODO: change before release?
     log_file_name = os.path.join(args.logs_dir, 'letsencrypt.log')
     file_handler = logging.handlers.RotatingFileHandler(
-        log_file_name, maxBytes=2**20, backupCount=10)
+        log_file_name, maxBytes=2 ** 20, backupCount=10)
     # rotate on each invocation, rollover only possible when maxBytes
     # is nonzero and backupCount is nonzero, so we set maxBytes as big
     # as possible not to overrun in single CLI invocation (1MB).

letsencrypt/tests/cli_test.py

@@ -6,14 +6,13 @@ import traceback
 import tempfile
 import unittest
 
-import configobj
 import mock
 
 from letsencrypt import account
 from letsencrypt import configuration
 from letsencrypt import errors
-from letsencrypt import storage
 
+from letsencrypt.tests import renewer_test
 from letsencrypt.tests import test_util
 
 
@@ -166,40 +165,13 @@ class DetermineAccountTest(unittest.TestCase):
         self.assertEqual("other email", self.args.email)
 
 
-class DuplicativeCertsTest(unittest.TestCase):
+class DuplicativeCertsTest(renewer_test.BaseRenewableCertTest):
+    """Test to avoid duplicate lineages."""
 
     def setUp(self):
-        # The stuff below is taken from renewer_test.py
-        self.tempdir = tempfile.mkdtemp()
-        self.cli_config = configuration.RenewerConfiguration(
-            namespace=mock.MagicMock(config_dir=self.tempdir))
-        os.makedirs(os.path.join(self.tempdir, "live", "example.org"))
-        os.makedirs(os.path.join(self.tempdir, "archive", "example.org"))
-        os.makedirs(os.path.join(self.tempdir, "configs"))
-        config = configobj.ConfigObj()
-        for kind in storage.ALL_FOUR:
-            config[kind] = os.path.join(self.tempdir, "live", "example.org",
-                                        kind + ".pem")
-        config.filename = os.path.join(self.tempdir, "configs",
-                                       "example.org.conf")
-        config.write()
-        self.config = config
-        self.defaults = configobj.ConfigObj()
-        self.test_rc = storage.RenewableCert(
-            self.config, self.defaults, self.cli_config)
-        for kind in storage.ALL_FOUR:
-            where = getattr(self.test_rc, kind)
-            os.symlink(os.path.join("..", "..", "archive", "example.org",
-                                    "{0}12.pem".format(kind)), where)
-            with open(where, "w") as f:
-                f.write(kind)
-            os.unlink(where)
-            os.symlink(os.path.join("..", "..", "archive", "example.org",
-                                    "{0}11.pem".format(kind)), where)
-            with open(where, "w") as f:
-                f.write(kind)
-
-        # Here we will use test_rc to create duplicative stuff
+        super(DuplicativeCertsTest, self).setUp()
+        self.config.write()
+        self._write_out_ex_kinds()
 
     def tearDown(self):
         shutil.rmtree(self.tempdir)

letsencrypt/tests/renewer_test.py

@@ -32,9 +32,8 @@ def fill_with_sample_data(rc_object):
             f.write(kind)
 
 
-class RenewableCertTests(unittest.TestCase):
-    # pylint: disable=too-many-public-methods
-    """Tests for letsencrypt.renewer.*."""
+class BaseRenewableCertTest(unittest.TestCase):
+
     def setUp(self):
         from letsencrypt import storage
         self.tempdir = tempfile.mkdtemp()
@@ -52,10 +51,31 @@ class RenewableCertTests(unittest.TestCase):
                                         kind + ".pem")
         config.filename = os.path.join(self.tempdir, "configs",
                                        "example.org.conf")
+        self.config = config
 
         self.defaults = configobj.ConfigObj()
         self.test_rc = storage.RenewableCert(
-            config, self.defaults, self.cli_config)
+            self.config, self.defaults, self.cli_config)
+
+    def _write_out_ex_kinds(self):
+        for kind in ALL_FOUR:
+            where = getattr(self.test_rc, kind)
+            os.symlink(os.path.join("..", "..", "archive", "example.org",
+                                    "{0}12.pem".format(kind)), where)
+            with open(where, "w") as f:
+                f.write(kind)
+            os.unlink(where)
+            os.symlink(os.path.join("..", "..", "archive", "example.org",
+                                    "{0}11.pem".format(kind)), where)
+            with open(where, "w") as f:
+                f.write(kind)
+
+
+class RenewableCertTests(BaseRenewableCertTest):
+    # pylint: disable=too-many-public-methods
+    """Tests for letsencrypt.renewer.*."""
+    def setUp(self):
+        super(RenewableCertTests, self).setUp()
 
     def tearDown(self):
         shutil.rmtree(self.tempdir)
@@ -341,17 +361,8 @@ class RenewableCertTests(unittest.TestCase):
         """Test should_autodeploy() and should_autorenew() on the basis
         of expiry time windows."""
         test_cert = test_util.load_vector("cert.pem")
-        for kind in ALL_FOUR:
-            where = getattr(self.test_rc, kind)
-            os.symlink(os.path.join("..", "..", "archive", "example.org",
-                                    "{0}12.pem".format(kind)), where)
-            with open(where, "w") as f:
-                f.write(kind)
-            os.unlink(where)
-            os.symlink(os.path.join("..", "..", "archive", "example.org",
-                                    "{0}11.pem".format(kind)), where)
-            with open(where, "w") as f:
-                f.write(kind)
+        self._write_out_ex_kinds()
+
         self.test_rc.update_all_links_to(12)
         with open(self.test_rc.cert, "w") as f:
             f.write(test_cert)

tox.cover.sh

@@ -16,7 +16,7 @@ fi
 
 cover () {
   if [ "$1" = "letsencrypt" ]; then
-    min=97
+    min=96
   elif [ "$1" = "acme" ]; then
     min=100
   elif [ "$1" = "letsencrypt_apache" ]; then