Fix conductor unit tests

Signed-off-by: jamshale <[email protected]>

aries_cloudagent/core/tests/test_conductor.py

@@ -117,7 +117,7 @@ async def test_startup_version_record_exists(self):
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -179,7 +179,7 @@ async def test_startup_version_no_upgrade_add_record(self):
         ) as mock_inbound_mgr, mock.patch.object(
             test_module, "OutboundTransportManager", autospec=True
         ) as mock_outbound_mgr, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -218,7 +218,7 @@ async def test_startup_version_no_upgrade_add_record(self):
         ) as mock_inbound_mgr, mock.patch.object(
             test_module, "OutboundTransportManager", autospec=True
         ) as mock_outbound_mgr, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -264,7 +264,7 @@ async def test_startup_version_force_upgrade(self):
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -305,7 +305,7 @@ async def test_startup_version_force_upgrade(self):
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -346,7 +346,7 @@ async def test_startup_version_force_upgrade(self):
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -386,7 +386,7 @@ async def test_startup_version_record_not_exists(self):
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -464,7 +464,7 @@ async def test_startup_no_public_did(self):
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -509,7 +509,7 @@ async def test_stats(self):
         ) as mock_inbound_mgr, mock.patch.object(
             test_module, "OutboundTransportManager", autospec=True
         ) as mock_outbound_mgr, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger:
@@ -903,7 +903,7 @@ async def test_admin(self):
         ) as admin_start, mock.patch.object(
             admin, "stop", autospec=True
         ) as admin_stop, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -957,7 +957,7 @@ async def test_admin_startx(self):
         ) as oob_mgr, mock.patch.object(
             test_module, "ConnectionManager"
         ) as conn_mgr, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1016,7 +1016,7 @@ async def test_start_static(self):
         ), mock.patch.object(
             test_module, "OutboundTransportManager", autospec=True
         ) as mock_outbound_mgr, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade:
             mock_outbound_mgr.return_value.registered_transports = {
                 "test": mock.MagicMock(schemes=["http"])
@@ -1192,7 +1192,7 @@ async def test_print_invite_connection(self):
         ), mock.patch.object(
             test_module, "OutboundTransportManager", autospec=True
         ) as mock_outbound_mgr, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade:
             mock_outbound_mgr.return_value.registered_transports = {
                 "test": mock.MagicMock(schemes=["http"])
@@ -1230,7 +1230,7 @@ async def test_clear_default_mediator(self):
             "MediationManager",
             return_value=mock.MagicMock(clear_default_mediator=mock.CoroutineMock()),
         ) as mock_mgr, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1284,7 +1284,7 @@ async def test_set_default_mediator(self):
                 ]
             ),
         ), mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade:
             await conductor.start()
             await conductor.stop()
@@ -1308,7 +1308,7 @@ async def test_set_default_mediator_x(self):
             "retrieve_by_id",
             mock.CoroutineMock(side_effect=Exception()),
         ), mock.patch.object(test_module, "LOGGER") as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1458,7 +1458,7 @@ async def test_mediator_invitation_0160(self, mock_from_url, _):
         ) as mock_mgr, mock.patch.object(
             mock_conn_record, "metadata_set", mock.CoroutineMock()
         ), mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1519,7 +1519,7 @@ async def test_mediator_invitation_0434(self, mock_from_url, _):
                 )
             ),
         ) as mock_mgr, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1579,7 +1579,7 @@ async def test_mediation_invitation_should_use_stored_invitation(
         ), mock.patch.object(
             test_module, "MediationManager", return_value=mock_mediation_manager
         ), mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1636,7 +1636,7 @@ async def test_mediation_invitation_should_not_create_connection_for_old_invitat
                 ]
             ),
         ), mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade:
             # when
             await conductor.start()
@@ -1672,7 +1672,7 @@ async def test_mediator_invitation_x(self, _):
         ) as mock_from_url, mock.patch.object(
             test_module, "LOGGER"
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1737,7 +1737,7 @@ async def test_startup_x_no_storage_version(self):
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LOGGER"
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1780,7 +1780,7 @@ async def test_startup_storage_type_exists_and_matches(self):
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1885,7 +1885,7 @@ async def test_startup_storage_type_does_not_exist_and_existing_agent_then_set_t
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",
@@ -1951,7 +1951,7 @@ async def test_startup_storage_type_does_not_exist_and_new_anoncreds_agent(
         ) as mock_outbound_mgr, mock.patch.object(
             test_module, "LoggingConfigurator", autospec=True
         ) as mock_logger, mock.patch.object(
-            test_module, "upgrade_wallet_to_anoncreds", return_value=False
+            test_module, "upgrade_wallet_to_anoncreds_if_requested", return_value=False
         ) as mock_upgrade, mock.patch.object(
             BaseStorage,
             "find_record",