starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-31 18:34:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_771

Browse Source 
Conflicts:
	letsencrypt/cli.py
This commit is contained in:
James Kasten
2015-09-25 20:11:15 -07:00
parent add23360a5 5cc9061413
commit 395da0d7d5
24 changed files with 151 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/tests/le_util_test.py
+1 -1
View File
@@ -92,7 +92,7 @@ class MakeOrVerifyDirTest(unittest.TestCase):
def _call(self, directory, mode):
from letsencrypt.le_util import make_or_verify_dir
return make_or_verify_dir(directory, mode, self.uid)
return make_or_verify_dir(directory, mode, self.uid, strict=True)
def test_creates_dir_when_missing(self):
path = os.path.join(self.root_path, "bar")
letsencrypt/tests/renewer_test.py
+2 -2
View File
@@ -48,13 +48,13 @@ class BaseRenewableCertTest(unittest.TestCase):
# TODO: maybe provide RenewerConfiguration.make_dirs?
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"))
os.makedirs(os.path.join(self.tempdir, "renewal"))
config = configobj.ConfigObj()
for kind in ALL_FOUR:
config[kind] = os.path.join(self.tempdir, "live", "example.org",
kind + ".pem")
config.filename = os.path.join(self.tempdir, "configs",
config.filename = os.path.join(self.tempdir, "renewal",
"example.org.conf")
self.config = config