Fix base branch key in guess_pr()

Fix a dormant bug in guess_pr(): wrong base branch key has been used
for lookup of synced PRs.

Apparently this code path almost never executed until e28008d, which
removed another level of "cache" with lookup by name.

Differential Revision: D79693152

Reviewed-by: Jordan Rome <[email protected]>
Signed-off-by: Ihor Solodrai <[email protected]>

Author: theihor

kernel_patches_daemon/branch_worker.py

@@ -774,7 +774,7 @@ async def _guess_pr(
 
         try:
             # we assuming only one PR can be active for one head->base
-            return self.all_prs[branch][self.repo_branch][0]
+            return self.all_prs[branch][self.repo_pr_base_branch][0]
         except (KeyError, IndexError):
             pass
 

tests/test_branch_worker.py

@@ -644,7 +644,7 @@ async def test_guess_pr_return_from_secondary_cache_with_specified_branch(
         series = Series(self._pw, SERIES_DATA)
         sentinel = random.random()
         self._bw.all_prs[mybranch] = {}
-        self._bw.all_prs[mybranch][TEST_REPO_BRANCH] = [sentinel]
+        self._bw.all_prs[mybranch][TEST_REPO_PR_BASE_BRANCH] = [sentinel]
         pr = await self._bw._guess_pr(series, mybranch)
         self.assertEqual(sentinel, pr)
 
@@ -661,7 +661,7 @@ async def test_guess_pr_return_from_secondary_cache_without_specified_branch(
 
         sentinel = random.random()
         self._bw.all_prs[mybranch] = {}
-        self._bw.all_prs[mybranch][TEST_REPO_BRANCH] = [sentinel]
+        self._bw.all_prs[mybranch][TEST_REPO_PR_BASE_BRANCH] = [sentinel]
         pr = await self._bw._guess_pr(series, mybranch)
         self.assertEqual(sentinel, pr)