From 3b07d57ff91e582d56d323f53e4506be28313663 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 24 Nov 2022 16:29:54 +0000 Subject: [PATCH] commit_in_branch.py: fix tests Apparently these were backported since I wrote these tests ^^ Signed-off-by: Eric Engestrom Part-of: --- bin/commit_in_branch_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/commit_in_branch_test.py b/bin/commit_in_branch_test.py index d6033ec8e9d..0e4be6ff95f 100644 --- a/bin/commit_in_branch_test.py +++ b/bin/commit_in_branch_test.py @@ -106,10 +106,10 @@ def test_branch_has_commit(branch: str, commit: str, expected: bool) -> None: ('20.1', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', 'd043d24654c851f0be57dbbf48274b5373dea42b'), ('20.1', '20.1-branchpoint', ''), ('20.1', '20.0', ''), - ('20.1', '20.2', ''), + ('20.1', '20.2', 'abac4859618e02aea00f705b841a7c5c5007ad1a'), ('20.1', 'main', ''), ('20.1', 'd043d24654c851f0be57dbbf48274b5373dea42b', ''), - ('20.0', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', ''), + ('20.0', 'dd2bd68fa69124c86cd008b256d06f44fab8e6cd', '8cd4f57381cefe69019a3282d457d5bda3644030'), ]) def test_branch_has_backport_of_commit(branch: str, commit: str, expected: bool) -> None: upstream = get_upstream()