Skip to content

Commit c428b23

Browse files
committed
fix: mock issues in tests
Signed-off-by: Daniel Bluhm <dbluhm@pm.me>
1 parent a79890b commit c428b23

File tree

3 files changed

+15
-31
lines changed

3 files changed

+15
-31
lines changed

aries_cloudagent/protocols/endorse_transaction/v1_0/handlers/tests/test_transaction_job_to_send_handler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async def test_called(self):
2626
await handler.handle(request_context, responder)
2727

2828
mock_tran_mgr.return_value.set_transaction_their_job.assert_called_once_with(
29-
request_context.message, request_context.message_receipt
29+
request_context.message, request_context.connection_record
3030
)
3131
assert not responder.messages
3232

@@ -48,6 +48,6 @@ async def test_called_x(self):
4848
await handler.handle(request_context, responder)
4949

5050
mock_tran_mgr.return_value.set_transaction_their_job.assert_called_once_with(
51-
request_context.message, request_context.message_receipt
51+
request_context.message, request_context.connection_record
5252
)
5353
assert not responder.messages

aries_cloudagent/protocols/endorse_transaction/v1_0/handlers/transaction_job_to_send_handler.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ async def handle(self, context: RequestContext, responder: BaseResponder):
2626

2727
if not context.connection_ready:
2828
raise HandlerException("No connection established")
29+
assert context.connection_record
2930

3031
mgr = TransactionManager(context.profile)
3132
try:
32-
await mgr.set_transaction_their_job(context.message, context.message_receipt)
33+
await mgr.set_transaction_their_job(
34+
context.message, context.connection_record
35+
)
3336
except TransactionManagerError:
3437
self._logger.exception("Error receiving transaction jobs")

aries_cloudagent/protocols/endorse_transaction/v1_0/tests/test_manager.py

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from .....cache.in_memory import InMemoryCache
1313
from .....connections.models.conn_record import ConnRecord
1414
from .....ledger.base import BaseLedger
15-
from .....storage.error import StorageNotFoundError
1615
from .....tests import mock
1716
from .....wallet.base import BaseWallet
1817
from .....wallet.did_method import SOV, DIDMethods
@@ -804,34 +803,16 @@ async def test_set_transaction_my_job(self):
804803
async def test_set_transaction_their_job(self):
805804
mock_job = mock.MagicMock()
806805
mock_conn = mock.MagicMock()
806+
mock_conn.metadata_get = mock.CoroutineMock(
807+
side_effect=[
808+
None,
809+
{"meta": "data"},
810+
]
811+
)
812+
mock_conn.metadata_set = mock.CoroutineMock()
807813

808-
with mock.patch.object(
809-
ConnRecord, "retrieve_by_did", mock.CoroutineMock()
810-
) as mock_retrieve:
811-
mock_retrieve.return_value = mock.MagicMock(
812-
metadata_get=mock.CoroutineMock(
813-
side_effect=[
814-
None,
815-
{"meta": "data"},
816-
]
817-
),
818-
metadata_set=mock.CoroutineMock(),
819-
)
820-
821-
for i in range(2):
822-
await self.manager.set_transaction_their_job(mock_job, mock_conn)
823-
824-
async def test_set_transaction_their_job_conn_not_found(self):
825-
mock_job = mock.MagicMock()
826-
mock_conn = mock.MagicMock()
827-
828-
with mock.patch.object(
829-
ConnRecord, "retrieve_by_did", mock.CoroutineMock()
830-
) as mock_retrieve:
831-
mock_retrieve.side_effect = StorageNotFoundError()
832-
833-
with self.assertRaises(TransactionManagerError):
834-
await self.manager.set_transaction_their_job(mock_job, mock_conn)
814+
for i in range(2):
815+
await self.manager.set_transaction_their_job(mock_job, mock_conn)
835816

836817
@mock.patch.object(AnonCredsIssuer, "finish_schema")
837818
@mock.patch.object(AnonCredsIssuer, "finish_cred_def")

0 commit comments

Comments
 (0)