Skip to content

Instantly share code, notes, and snippets.

View bmw's full-sized avatar

Brad Warren bmw

  • Electronic Frontier Foundation
  • San Francisco, CA
  • 06:41 (UTC -07:00)
View GitHub Profile
diff --git a/certbot/tests/renewal_test.py b/certbot/tests/renewal_test.py
index 1cc85934e..9e22409d0 100644
--- a/certbot/tests/renewal_test.py
+++ b/certbot/tests/renewal_test.py
@@ -181,7 +181,7 @@ class RenewalTest(test_util.ConfigTestCase):
from certbot._internal import renewal
lineage_config = copy.deepcopy(self.config)
- renewal.reconstitute(lineage_config, rc_path)
+ renewal._reconstitute(lineage_config, rc_path)
@bmw
bmw / 11
Created August 2, 2021 22:18
2021-07-25T04:56:10.8467575Z ##[section]Starting: Run tox
2021-07-25T04:56:10.8477984Z ==============================================================================
2021-07-25T04:56:10.8478311Z Task : Bash
2021-07-25T04:56:10.8478607Z Description : Run a Bash script on macOS, Linux, or Windows
2021-07-25T04:56:10.8479239Z Version : 3.182.0
2021-07-25T04:56:10.8479467Z Author : Microsoft Corporation
2021-07-25T04:56:10.8479984Z Help : https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash
2021-07-25T04:56:10.8480359Z ==============================================================================
2021-07-25T04:56:10.9832717Z Generating script.
2021-07-25T04:56:10.9860323Z ========================== Starting Command Output ===========================
@bmw
bmw / 11
Created August 2, 2021 22:17
2021-08-02T21:58:37.8003634Z ##[section]Starting: Run tox
2021-08-02T21:58:37.8011248Z ==============================================================================
2021-08-02T21:58:37.8011575Z Task : Bash
2021-08-02T21:58:37.8011878Z Description : Run a Bash script on macOS, Linux, or Windows
2021-08-02T21:58:37.8012169Z Version : 3.189.0
2021-08-02T21:58:37.8012435Z Author : Microsoft Corporation
2021-08-02T21:58:37.8012805Z Help : https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash
2021-08-02T21:58:37.8013209Z ==============================================================================
2021-08-02T21:58:37.9172755Z Generating script.
2021-08-02T21:58:37.9198530Z ========================== Starting Command Output ===========================
diff --git a/certbot/certbot/_internal/plugins/disco.py b/certbot/certbot/_internal/plugins/disco.py
index e45b0f405..c9b02efa7 100644
--- a/certbot/certbot/_internal/plugins/disco.py
+++ b/certbot/certbot/_internal/plugins/disco.py
@@ -372,31 +372,4 @@ def _implements(target_class: Type[interfaces.Plugin], iface: Type) -> bool:
def _verify(target_instance: interfaces.Plugin, target_class: Type[interfaces.Plugin],
iface: Type) -> bool:
- if issubclass(target_class, iface):
- # No need to trigger some verify logic for ABCs: when the object is instantiated,
diff --git a/certbot-nginx/certbot_nginx/_internal/configurator.py b/certbot-nginx/certbot_nginx/_internal/configurator.py
index 66136ba70..ec9f9053d 100644
--- a/certbot-nginx/certbot_nginx/_internal/configurator.py
+++ b/certbot-nginx/certbot_nginx/_internal/configurator.py
@@ -16,6 +16,7 @@ from typing import Tuple
import OpenSSL
import pkg_resources
+import zope.interface
diff --git a/certbot-apache/tests/debian_test.py b/certbot-apache/tests/debian_test.py
index b5a486ff1..35425223b 100644
--- a/certbot-apache/tests/debian_test.py
+++ b/certbot-apache/tests/debian_test.py
@@ -9,6 +9,7 @@ except ImportError: # pragma: no cover
from certbot import errors
from certbot.compat import os
+from certbot.tests import util as certbot_util
from certbot_apache._internal import apache_util
installer distinct_user_count
None 1415658
apache 788455
nginx 768776
null 392
certbot-s3front:installer 228
authenticator distinct_user_count
webroot 846422
apache 774433
nginx 763113
standalone 388619
manual 139070
dns-cloudflare 41256
dns-route53 37629
dns-digitalocean 7895
dns-ovh 5374
2020-10-07T20:17:19.9284020Z ##[section]Starting: Run tox
2020-10-07T20:17:19.9294141Z ==============================================================================
2020-10-07T20:17:19.9294528Z Task : Bash
2020-10-07T20:17:19.9294858Z Description : Run a Bash script on macOS, Linux, or Windows
2020-10-07T20:17:19.9295154Z Version : 3.176.0
2020-10-07T20:17:19.9295484Z Author : Microsoft Corporation
2020-10-07T20:17:19.9295835Z Help : https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash
2020-10-07T20:17:19.9296291Z ==============================================================================
2020-10-07T20:17:20.0564675Z Generating script.
2020-10-07T20:17:20.0589755Z ========================== Starting Command Output ===========================
This file has been truncated, but you can view the full file.
Launching a container.
Waiting for container to be ready
Created symlink /etc/systemd/system/dbus-org.freedesktop.network1.service → /lib/systemd/system/systemd-networkd.service.
Waiting for network to be ready...
Get:1 http://ports.ubuntu.com/ubuntu-ports focal-security InRelease [107 kB]
Get:2 http://ports.ubuntu.com/ubuntu-ports focal InRelease [265 kB]
Get:3 http://ports.ubuntu.com/ubuntu-ports focal-updates InRelease [111 kB]
Get:4 http://ports.ubuntu.com/ubuntu-ports focal-security/main Sources [50.8 kB]
Get:5 http://ports.ubuntu.com/ubuntu-ports focal-security/multiverse Sources [716 B]
Get:6 http://ports.ubuntu.com/ubuntu-ports focal-security/universe Sources [7940 B]