fix constants test, add ignored certificate to installer testdata

certbot_haproxy/constants.py

@@ -120,7 +120,6 @@ def os_analyse():
     os_info = util.get_os_info()
     distro = os_info[0].lower()
     version = os_info[1]
-
     if distro not in CLI_DEFAULTS:
         raise errors.NotSupportedError(
             "We're sorry, your OS  %s %s is currently not supported :("

certbot_haproxy/tests/constants.py

@@ -3,7 +3,6 @@ from mock import patch
 from certbot.errors import NotSupportedError
 from certbot_haproxy import constants
 
-
 class ConstantsTest(unittest.TestCase):
     """
         Test that the right constants are chosen and the correct warnings are
@@ -28,7 +27,7 @@ class ConstantsTest(unittest.TestCase):
         }
     }
 
-    @patch('constants.CLI_DEFAULTS', return_value=CLI_DEFAULTS)
+    @patch('certbot_haproxy.constants.CLI_DEFAULTS', new=CLI_DEFAULTS)
     @patch('certbot.util.get_os_info', return_value=['debian', '8'])
     def test_os_analyse_supported(self, *mocks):
         """ Test a supported version.. """
@@ -37,7 +36,7 @@ class ConstantsTest(unittest.TestCase):
             ('debian', '8')
         )
 
-    @patch('constants.CLI_DEFAULTS', return_value=CLI_DEFAULTS)
+    @patch('certbot_haproxy.constants.CLI_DEFAULTS', new=CLI_DEFAULTS)
     @patch('certbot.util.get_os_info', return_value=['debian', '9'])
     @patch('certbot_haproxy.constants.logger')
     def test_os_analyse_unsupported_new(self, m_logger, *mocks):
@@ -48,21 +47,21 @@ class ConstantsTest(unittest.TestCase):
         )
         m_logger.warn.assert_called_once()
 
-    @patch('constants.CLI_DEFAULTS', return_value=CLI_DEFAULTS)
+    @patch('certbot_haproxy.constants.CLI_DEFAULTS', new=CLI_DEFAULTS)
     @patch('certbot.util.get_os_info', return_value=['debian', '6'])
     def test_os_analyse_unsupported_old(self, *mocks):
         """ Test an unsupported too old version.. """
         with self.assertRaises(NotSupportedError):
             constants.os_analyse(caching_disabled=True)
 
-    @patch('constants.CLI_DEFAULTS', return_value=CLI_DEFAULTS)
+    @patch('certbot_haproxy.constants.CLI_DEFAULTS', new=CLI_DEFAULTS)
     @patch('certbot.util.get_os_info', return_value=['centos', '7'])
     def test_os_analyse_unsupported_distro(self, *mocks):
         """ Test an unsupported OS/distro.. """
         with self.assertRaises(NotSupportedError):
             constants.os_analyse(caching_disabled=True)
 
-    @patch('constants.CLI_DEFAULTS', return_value=CLI_DEFAULTS)
+    @patch('certbot_haproxy.constants.CLI_DEFAULTS', new=CLI_DEFAULTS)
     @patch('certbot.util.get_os_info', return_value=['ubuntu', '15.06'])
     @patch('certbot_haproxy.constants.logger')
     def test_os_analyse_between_versions(self, m_logger, *mocks):

certbot_haproxy/tests/testdata/installer/certs/ignore.pem

@@ -0,0 +1,49 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHdX4LsYw2HEHC
+mSWgyLkSFKHVBbtUeyWfnJk/oe62dxIJQxqPW/xaQ2TJeSvxTmoLRaTYUySn9nH2
+oJ48PNcusZF86KlY/HGajMwh/9xZOPOi9iBaxzkrgzKWc9XEff4cM5v0lKWDMQn1
+L/N7ilpdEBlpqlZOKOhHV3QVB5TK6ccH69AwUZnFatJRTs6PZGd4B0VKRQoIXXSV
+CYtC4mhICa1mD9T0/A2eAUc4Ns5srtuUxpM5OWhslbM42NYLOfKCqaWZaHirjH67
+bI7t5yCbzxrqjExtniNuXR7mbyPg3p9IVhg5xBLJU7vP0zBF2DsTdoUIuu+7Jaal
+rRT5nBX5AgMBAAECggEBAK0Q7GJ3FwLod8LDIZwmLjdbAaSVyZqfE+EvfuVwu3FF
+VbgFqqkTlp43dd8/LXq+oFLRhhxR4C+BLhdh/Iql+8w/NM7eDfrxaB1C5+jkWixs
+tzICP8aksJ1pxF45ehV5gSC1Qy/wPsDbrxk5FxptzMSNMI+3xhUhd5JXdpi8sEVz
+EpvxHUJpfgel+0ZNQ64lx0KInAmuj5rzEQG8qTUY6GRJVS8JMKdig2N7zkgRMGSG
+Fphu8EN6dfgpG7bkQ6QKYao0nHNuqROaaqC7/owikyB47QKSBQgadi18HJ4F+swH
+/OjWo3q3LEeaLJQj6EkXWyTuyuNt3zgdMHFASBAMSwECgYEA/Sdrkd3gZsTcsBPv
+jqtFWXUDOjpoyk35naPk38zIbtdi7uFxaSvoItqMKjngakHNmAeHdKg4WOaKdrw1
+7VvfJAXtPKOooz6DGLrEbT5yBqhWHNXuwGU9wVX5usLc1Z4a/3I/rJBD+E+xhGMo
+I9dQJkyZuu/+ba40t0L+CXYnbNkCgYEAybOJjW1ImD1zxWHpVzRcZnDmBaPvD6Cp
+xa2YB+0/e19rWmhohprqJ25VuP5bnITaQP8v33PZ5GWvF5bgwzNsDNcdXBkNfAkC
+8RMEZYTvv+wLVVIHsukWDRvbn2kE/NgUTrjU8rjDbLnGSOrbxB9V/x8U8BUj8xRf
+NyTFQFruviECgYActEaPMJBMNtArKueDzsm7PfhStuLA5ZyDEl1WPvsPDl8KZQed
+/DuDEDLKauuWQMXWEix6vsQ82E8k7WxT8JHZnM5sjMYHVIQ63pp9JJJ7TMUO2fcL
+W69n5568XXH6ysWW51Zu86CxXB/tueyIO9a7sP3RY3r+5rzVdsQlQH9x6QKBgCan
+0eTY3ODQZi+d5CpiTpMTcAIEuPw1vlO0QT7DqTbrwpdBC0dAyT9lVehuVwBYNbvf
+LD2W5ltvYW8T6199q2eKkoXkB0GOOJIbIuyR3aDajBF99xvCsAczH5QdfGc4wiuU
+ILujzVA5CldPK28a0lBilJCufIVJkjXvRh5fTwIBAoGANCEACxXQffi5Eqsp71pW
+Aa310TpVVN+Z/KcCdZsi1fE+4z7RUBg6QKX51hALO7G874/yTg+kqXg/9WJ8UprQ
+KY+RLr2aKnSWyrCC+JjvjQ94Z47Ifbzx2A1fC2bY989TfqcgM/aa522nQnnY7fNw
+qQu7w9gg2IIvt5PCsCkWvLk=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmMCAgfAMA0GCSqGSIb3DQEBCwUAMIGCMRowGAYDVQQLDBFNaW5pc3Ry
+eSBvZiBUcnV0aDEaMBgGA1UECgwRTWluaXN0cnkgb2YgVHJ1dGgxGDAWBgNVBAMM
+D2xlaGFwcm94eS5sb2NhbDEQMA4GA1UECAwHT2NlYW5pYTELMAkGA1UEBhMCRlUx
+DzANBgNVBAcMBkxvbmRvbjAeFw0xNjA4MTcxNjUzNDVaFw0yNjA4MTUxNjUzNDVa
+MIGCMRowGAYDVQQLDBFNaW5pc3RyeSBvZiBUcnV0aDEaMBgGA1UECgwRTWluaXN0
+cnkgb2YgVHJ1dGgxGDAWBgNVBAMMD2xlaGFwcm94eS5sb2NhbDEQMA4GA1UECAwH
+T2NlYW5pYTELMAkGA1UEBhMCRlUxDzANBgNVBAcMBkxvbmRvbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMd1fguxjDYcQcKZJaDIuRIUodUFu1R7JZ+c
+mT+h7rZ3EglDGo9b/FpDZMl5K/FOagtFpNhTJKf2cfagnjw81y6xkXzoqVj8cZqM
+zCH/3Fk486L2IFrHOSuDMpZz1cR9/hwzm/SUpYMxCfUv83uKWl0QGWmqVk4o6EdX
+dBUHlMrpxwfr0DBRmcVq0lFOzo9kZ3gHRUpFCghddJUJi0LiaEgJrWYP1PT8DZ4B
+Rzg2zmyu25TGkzk5aGyVszjY1gs58oKppZloeKuMfrtsju3nIJvPGuqMTG2eI25d
+HuZvI+Den0hWGDnEEslTu8/TMEXYOxN2hQi677slpqWtFPmcFfkCAwEAATANBgkq
+hkiG9w0BAQsFAAOCAQEAFBIa3FNO1ZamO1/mpaA5AcxkWDx6wXZLcnua3i/XfcBG
+dtwHdzPCM+1naQ5wyJafQax6gHCvXyLPszKpc7ZIilhXZk5Af+SN7rCY3OJX5UDd
+7lTXwt3jk+ovwOp50Q6pHZCXw/r78j8uydfEQ6UkvfaBrZiakjw7ukKuenwYC34l
+UyrMYF8QLNCLxN7R55VJ8DGwo7gJgieCc8j0n+IoA4RzUDowP7hq3nVgkAojVQco
+w750L0lGh08rNu9h+jv06RjIjrn8DyqaSAezyXgCBJj1WHVCFQ14mOImY3TIzmhw
++VOYtmzUCME/5yqeinybBcWmKFW9yKfukYIvdG2mwQ==
+-----END CERTIFICATE-----