merge integration testing feature

examples/cli.ini

@@ -1,25 +0,0 @@
-# This is an example of the kind of things you can do in a configuration file.
-# All flags used by the client can be configured here. Run Certbot with
-# "--help" to learn more about the available options.
-
-# Use a 4096 bit RSA key instead of 2048
-rsa-key-size = 4096
-
-# Uncomment and update to register with the specified e-mail address
-# email = foo@example.com
-
-# Uncomment and update to generate certificates for the specified
-# domains.
-# domains = example.com, www.example.com
-
-# Uncomment to use a text interface instead of ncurses
-# text = True
-
-# Uncomment to use the standalone authenticator on port 443
-# authenticator = standalone
-# standalone-supported-challenges = tls-sni-01
-
-# Uncomment to use the webroot authenticator. Replace webroot-path with the
-# path to the public_html / webroot folder being served by your web server.
-# authenticator = webroot
-# webroot-path = /usr/share/nginx/html

examples/dev-cli.ini

@@ -1,20 +0,0 @@
-# Always use the staging/testing server - avoids rate limiting
-server = https://acme-staging.api.letsencrypt.org/directory
-
-# This is an example configuration file for developers
-config-dir = /tmp/le/conf
-work-dir = /tmp/le/conf
-logs-dir = /tmp/le/logs
-
-# make sure to use a valid email and domains!
-email = foo@example.com
-domains = example.com
-
-text = True
-agree-tos = True
-debug = True
-# Unfortunately, it's not possible to specify "verbose" multiple times
-# (correspondingly to -vvvvvv)
-verbose = True
-
-authenticator = standalone

examples/plugins/certbot_example_plugins.py

@@ -1,31 +0,0 @@
-"""Example Certbot plugins.
-
-For full examples, see `certbot.plugins`.
-
-"""
-import zope.interface
-
-from certbot import interfaces
-from certbot.plugins import common
-
-
-@zope.interface.implementer(interfaces.IAuthenticator)
-@zope.interface.provider(interfaces.IPluginFactory)
-class Authenticator(common.Plugin):
-    """Example Authenticator."""
-
-    description = "Example Authenticator plugin"
-
-    # Implement all methods from IAuthenticator, remembering to add
-    # "self" as first argument, e.g. def prepare(self)...
-
-
-@zope.interface.implementer(interfaces.IInstaller)
-@zope.interface.provider(interfaces.IPluginFactory)
-class Installer(common.Plugin):
-    """Example Installer."""
-
-    description = "Example Installer plugin"
-
-    # Implement all methods from IInstaller, remembering to add
-    # "self" as first argument, e.g. def get_all_names(self)...

examples/plugins/setup.py

@@ -1,17 +0,0 @@
-from setuptools import setup
-
-
-setup(
-    name='certbot-example-plugins',
-    package='certbot_example_plugins.py',
-    install_requires=[
-        'certbot',
-        'zope.interface',
-    ],
-    entry_points={
-        'certbot.plugins': [
-            'example_authenticator = certbot_example_plugins:Authenticator',
-            'example_installer = certbot_example_plugins:Installer',
-        ],
-    },
-)

provisioning_client.sh

@@ -34,11 +34,10 @@ cd "/${PROJECT_NAME}"
 pip install --editable .
 
 cat <<EOF >> /etc/hosts
-${PROJECT_SERVER_IP}   le.wtf
-${PROJECT_SERVER_IP}   le1.wtf
-${PROJECT_SERVER_IP}   le2.wtf
-${PROJECT_SERVER_IP}   le3.wtf
-${PROJECT_SERVER_IP}   nginx.wtf
+${PROJECT_CLIENT_IP}   le.wtf
+${PROJECT_CLIENT_IP}   le1.wtf
+${PROJECT_CLIENT_IP}   le2.wtf
+${PROJECT_CLIENT_IP}   le3.wtf
 ${PROJECT_CLIENT_IP}   testsite.nl
 EOF
 

tests/boulder-integration.sh

@@ -114,3 +114,5 @@ common revoke --cert-path "$root/conf/live/le.wtf/cert.pem"
 # revoke by cert key
 common revoke --cert-path "$root/conf/live/le2.wtf/cert.pem" \
        --key-path "$root/conf/live/le2.wtf/privkey.pem"
+
+echo "\n\nFinished successfully!"

tests/integration/_common.sh

@@ -30,6 +30,5 @@ certbot_test_no_force_renew () {
         --agree-tos \
         --register-unsafely-without-email \
         --debug \
-        -vvvvvvv \
         "$@"
 }