fix tests broken by #9262

certbot-ci/certbot_integration_tests/certbot_tests/test_main.py

@@ -482,7 +482,7 @@ def test_new_key(context: IntegrationTestsContext) -> None:
     certname = context.get_domain('newkey')
 
     context.certbot(['--domains', certname, '--reuse-key',
-                     '--key-type', 'rsa', '--rsa-key-size', '4096'])
+                     '--key-type', 'ecdsa', '--elliptic-curve', 'secp384r1'])
     privkey1, _ = private_key(1)
 
     # renew: --new-key should replace the key, but keep reuse_key and the key type + params
@@ -490,34 +490,33 @@ def test_new_key(context: IntegrationTestsContext) -> None:
     privkey2, privkey2_path = private_key(2)
     assert privkey1 != privkey2
     assert_saved_lineage_option(context.config_dir, certname, 'reuse_key', 'True')
-    assert_rsa_key(privkey2_path, 4096)
+    assert_elliptic_key(privkey2_path, SECP384R1)
 
-    # certonly: it should replace the key but the key size will change
+    # certonly: it should replace the key but the elliptic curve will change
     context.certbot(['certonly', '-d', certname, '--reuse-key', '--new-key'])
     privkey3, privkey3_path = private_key(3)
     assert privkey2 != privkey3
     assert_saved_lineage_option(context.config_dir, certname, 'reuse_key', 'True')
-    assert_rsa_key(privkey3_path, 2048)
+    assert_elliptic_key(privkey3_path, SECP256R1)
 
     # certonly: it should be possible to change the key type and keep reuse_key
-    context.certbot(['certonly', '-d', certname, '--reuse-key', '--new-key', '--key-type', 'ecdsa',
+    context.certbot(['certonly', '-d', certname, '--reuse-key', '--new-key', '--key-type', 'rsa',
-                     '--cert-name', certname])
+                     '--rsa-key-size', '4096', '--cert-name', certname])
     privkey4, privkey4_path = private_key(4)
     assert privkey3 != privkey4
     assert_saved_lineage_option(context.config_dir, certname, 'reuse_key', 'True')
-    assert_elliptic_key(privkey4_path, SECP256R1)
+    assert_rsa_key(privkey4_path, 4096)
 
     # certonly: it should not be possible to change a key parameter without --new-key
     with pytest.raises(subprocess.CalledProcessError) as error:
-        context.certbot(['certonly', '-d', certname, '--reuse-key',
+        context.certbot(['certonly', '-d', certname, '--key-type', 'rsa', '--reuse-key',
-                         '--elliptic-curve', 'secp384r1'])
+                         '--rsa-key-size', '2048'])
-    assert 'Unable to change the --elliptic-curve' in error.value.stderr
+    assert 'Unable to change the --rsa-key-size' in error.value.stderr
 
     # certonly: not specifying --key-type should keep the existing key type (non-interactively).
-    # TODO: when ECDSA is made default key type, the key types must be inverted
     context.certbot(['certonly', '-d', certname, '--no-reuse-key'])
     privkey5, privkey5_path = private_key(5)
-    assert_elliptic_key(privkey5_path, SECP256R1)
+    assert_rsa_key(privkey5_path, 2048)
     assert privkey4 != privkey5
 
 

certbot/certbot/tests/util.py

@@ -153,7 +153,7 @@ def load_pyopenssl_private_key(*names: str) -> crypto.PKey:
     return crypto.load_privatekey(loader, load_vector(*names))
 
 
-def make_lineage(config_dir: str, testfile: str, ec: bool = False) -> str:
+def make_lineage(config_dir: str, testfile: str, ec: bool = True) -> str:
     """Creates a lineage defined by testfile.
 
     This creates the archive, live, and renewal directories if

certbot/tests/main_test.py

@@ -1208,8 +1208,9 @@ class MainTest(test_util.ConfigTestCase):
         mock_lineage.should_autorenew.return_value = due_for_renewal
         mock_lineage.has_pending_deployment.return_value = False
         mock_lineage.names.return_value = ['isnot.org']
-        mock_lineage.private_key_type = 'RSA'
+        mock_lineage.private_key_type = 'ecdsa'
-        mock_lineage.rsa_key_size = 2048
+        mock_lineage.elliptic_curve = 'secp256r1'
+        mock_lineage.reuse_key = reuse_key
         mock_certr = mock.MagicMock()
         mock_key = mock.MagicMock(pem='pem_key')
         mock_client = mock.MagicMock()
@@ -1253,11 +1254,11 @@ class MainTest(test_util.ConfigTestCase):
                 if reuse_key and not new_key:
                     # The location of the previous live privkey.pem is passed
                     # to obtain_certificate
-                    mock_client.obtain_certificate.assert_called_once_with(['isnot.org'],
+                    mock_client.obtain_certificate.assert_called_once_with([mock.ANY],
                         os.path.normpath(os.path.join(
                             self.config.config_dir, "live/sample-renewal/privkey.pem")))
                 else:
-                    mock_client.obtain_certificate.assert_called_once_with(['isnot.org'], None)
+                    mock_client.obtain_certificate.assert_called_once_with([mock.ANY], None)
             else:
                 self.assertEqual(mock_client.obtain_certificate.call_count, 0)
         except:

certbot/tests/renewal_test.py

@@ -57,7 +57,7 @@ class RenewalTest(test_util.ConfigTestCase):
 
     @mock.patch('certbot._internal.renewal._avoid_reuse_key_conflicts')
     def test_reuse_key_renewal_params(self, unused_mock_avoid_reuse_conflicts):
-        self.config.rsa_key_size = 'INVALID_VALUE'
+        self.config.elliptic_curve = 'INVALID_VALUE'
         self.config.reuse_key = True
         self.config.dry_run = True
         config = configuration.NamespaceConfig(self.config)
@@ -74,7 +74,7 @@ class RenewalTest(test_util.ConfigTestCase):
         with mock.patch('certbot._internal.renewal.hooks.renew_hook'):
             renewal.renew_cert(self.config, None, le_client, lineage)
 
-        assert self.config.rsa_key_size == 2048
+        assert self.config.elliptic_curve == 'secp256r1'
 
     @mock.patch('certbot._internal.renewal._avoid_reuse_key_conflicts')
     def test_reuse_ec_key_renewal_params(self, unused_mock_avoid_reuse_conflicts):
@@ -153,7 +153,7 @@ class RenewalTest(test_util.ConfigTestCase):
 
         from certbot._internal import renewal
 
-        with self.assertRaisesRegex(errors.Error, "Unable to change the --rsa-key-type"):
+        with self.assertRaisesRegex(errors.Error, "Unable to change the --key-type"):
             renewal.renew_cert(self.config, None, le_client, lineage)
 
         # ... unless --no-reuse-key is set