Skip to content

[route_check] remove check-frr_patch mock #2732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 1 commit into from
Mar 17, 2023
Merged

[route_check] remove check-frr_patch mock #2732

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions tests/route_check_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,17 +277,12 @@ def test_route_check(self, mock_dbs, test_num):
with patch('sys.argv', ct_data[ARGS].split()), \
patch('route_check.subprocess.check_output') as mock_check_output:

check_frr_patch = patch('route_check.check_frr_pending_routes', lambda: [])
routes = ct_data.get(FRR_ROUTES, {})

if FRR_ROUTES in ct_data:
routes = ct_data[FRR_ROUTES]
def side_effect(*args, **kwargs):
return json.dumps(routes)

def side_effect(*args, **kwargs):
return json.dumps(routes)

mock_check_output.side_effect = side_effect
else:
check_frr_patch.start()
mock_check_output.side_effect = side_effect

ret, res = route_check.main()
expect_ret = ct_data[RET] if RET in ct_data else 0
Expand All @@ -299,8 +294,6 @@ def side_effect(*args, **kwargs):
assert ret == expect_ret
assert res == expect_res

check_frr_patch.stop()

def test_timeout(self, mock_dbs, force_hang):
# Test timeout
ex_raised = False
Expand Down