Skip to content

Commit 26a5f81

Browse files
committed
Use fetch_tracker in test_graph_traversal
Replace the use of "patch" in test_graph_traversal with the newly added fetch_tracker from RepositorySimulator. Signed-off-by: Teodora Sechkova <[email protected]>
1 parent 1ba9301 commit 26a5f81

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

tests/test_updater_delegation_graphs.py

+10-14
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import unittest
1313
from dataclasses import astuple, dataclass, field
1414
from typing import Iterable, List, Optional
15-
from unittest.mock import call, patch
1615

1716
from tests import utils
1817
from tests.repository_simulator import RepositorySimulator
@@ -235,27 +234,24 @@ def test_graph_traversal(self, test_data: DelegationsTestCase) -> None:
235234

236235
try:
237236
exp_files = [*TOP_LEVEL_ROLE_NAMES, *test_data.visited_order]
238-
exp_calls = [call(role, 1) for role in test_data.visited_order]
237+
exp_calls = [(role, 1) for role in test_data.visited_order]
239238

240239
sim = self.setup_subtest(test_data.delegations)
241240
updater = self._init_updater(sim)
242241
# Call explicitly refresh to simplify the expected_calls list
243242
updater.refresh()
243+
sim.fetch_tracker.metadata.clear()
244244
# Check that metadata dir contains only top-level roles
245245
self._assert_files_exist(TOP_LEVEL_ROLE_NAMES)
246246

247-
with patch.object(
248-
sim, "fetch_metadata", wraps=sim.fetch_metadata
249-
) as wrapped_fetch:
250-
# Looking for a non-existing targetpath forces updater
251-
# to visit all possible delegated roles
252-
targetfile = updater.get_targetinfo("missingpath")
253-
254-
self.assertIsNone(targetfile)
255-
# Check that the delegated roles were visited in the expected
256-
# order and the corresponding metadata files were persisted
257-
self.assertListEqual(wrapped_fetch.call_args_list, exp_calls)
258-
self._assert_files_exist(exp_files)
247+
# Looking for a non-existing targetpath forces updater
248+
# to visit all possible delegated roles
249+
targetfile = updater.get_targetinfo("missingpath")
250+
self.assertIsNone(targetfile)
251+
# Check that the delegated roles were visited in the expected
252+
# order and the corresponding metadata files were persisted
253+
self.assertListEqual(sim.fetch_tracker.metadata, exp_calls)
254+
self._assert_files_exist(exp_files)
259255
finally:
260256
self.teardown_subtest()
261257

0 commit comments

Comments
 (0)