mirror of
https://github.com/certbot/certbot.git
synced 2026-08-02 19:22:16 +02:00
Don't run tests with Python 2.6 (#5627)
* Don't run tests with Python 2.6.
* Revert "Don't run tests with Python 2.6."
This reverts commit 4a9d778cca.
* Revert changes to auto_test.py.
This commit is contained in:
@@ -287,8 +287,8 @@ class AutoTests(TestCase):
|
|||||||
self.assertTrue(re.match(r'letsencrypt \d+\.\d+\.\d+',
|
self.assertTrue(re.match(r'letsencrypt \d+\.\d+\.\d+',
|
||||||
err.strip().splitlines()[-1]))
|
err.strip().splitlines()[-1]))
|
||||||
# Make a few assertions to test the validity of the next tests:
|
# Make a few assertions to test the validity of the next tests:
|
||||||
self.assertIn('Upgrading certbot-auto ', out)
|
self.assertTrue('Upgrading certbot-auto ' in out)
|
||||||
self.assertIn('Creating virtual environment...', out)
|
self.assertTrue('Creating virtual environment...' in out)
|
||||||
|
|
||||||
# Now we have le-auto 99.9.9 and LE 99.9.9 installed. This
|
# Now we have le-auto 99.9.9 and LE 99.9.9 installed. This
|
||||||
# conveniently sets us up to test the next 2 cases.
|
# conveniently sets us up to test the next 2 cases.
|
||||||
@@ -296,8 +296,8 @@ class AutoTests(TestCase):
|
|||||||
# Test when neither phase-1 upgrade nor phase-2 upgrade is
|
# Test when neither phase-1 upgrade nor phase-2 upgrade is
|
||||||
# needed (probably a common case):
|
# needed (probably a common case):
|
||||||
out, err = run_letsencrypt_auto()
|
out, err = run_letsencrypt_auto()
|
||||||
self.assertNotIn('Upgrading certbot-auto ', out)
|
self.assertFalse('Upgrading certbot-auto ' in out)
|
||||||
self.assertNotIn('Creating virtual environment...', out)
|
self.assertFalse('Creating virtual environment...' in out)
|
||||||
|
|
||||||
def test_phase2_upgrade(self):
|
def test_phase2_upgrade(self):
|
||||||
"""Test a phase-2 upgrade without a phase-1 upgrade."""
|
"""Test a phase-2 upgrade without a phase-1 upgrade."""
|
||||||
@@ -312,8 +312,8 @@ class AutoTests(TestCase):
|
|||||||
# Create venv saving the correct bootstrap script version
|
# Create venv saving the correct bootstrap script version
|
||||||
out, err = run_le_auto(le_auto_path, venv_dir, base_url,
|
out, err = run_le_auto(le_auto_path, venv_dir, base_url,
|
||||||
PIP_FIND_LINKS=pip_find_links)
|
PIP_FIND_LINKS=pip_find_links)
|
||||||
self.assertNotIn('Upgrading certbot-auto ', out)
|
self.assertFalse('Upgrading certbot-auto ' in out)
|
||||||
self.assertIn('Creating virtual environment...', out)
|
self.assertTrue('Creating virtual environment...' in out)
|
||||||
with open(join(venv_dir, BOOTSTRAP_FILENAME)) as f:
|
with open(join(venv_dir, BOOTSTRAP_FILENAME)) as f:
|
||||||
bootstrap_version = f.read()
|
bootstrap_version = f.read()
|
||||||
|
|
||||||
@@ -329,8 +329,8 @@ class AutoTests(TestCase):
|
|||||||
out, err = run_le_auto(le_auto_path, venv_dir, base_url,
|
out, err = run_le_auto(le_auto_path, venv_dir, base_url,
|
||||||
PIP_FIND_LINKS=pip_find_links)
|
PIP_FIND_LINKS=pip_find_links)
|
||||||
|
|
||||||
self.assertNotIn('Upgrading certbot-auto ', out)
|
self.assertFalse('Upgrading certbot-auto ' in out)
|
||||||
self.assertIn('Creating virtual environment...', out)
|
self.assertTrue('Creating virtual environment...' in out)
|
||||||
|
|
||||||
def test_openssl_failure(self):
|
def test_openssl_failure(self):
|
||||||
"""Make sure we stop if the openssl signature check fails."""
|
"""Make sure we stop if the openssl signature check fails."""
|
||||||
|
|||||||
Reference in New Issue
Block a user