Skip to content

Commit

Permalink
Merge pull request #4414 from boegel/fix_test_github_merge_pr
Browse files Browse the repository at this point in the history
use more recent easyblocks PR in test_github_merge_pr
  • Loading branch information
zao authored Dec 26, 2023
2 parents 3fb386c + 5aec5e2 commit 24d7862
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/framework/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -4822,20 +4822,20 @@ def test_github_merge_pr(self):
# --merge-pr also works on easyblocks (& framework) PRs
args = [
'--merge-pr',
'2805',
'2995',
'--pr-target-repo=easybuild-easyblocks',
'-D',
'--github-user=%s' % GITHUB_TEST_ACCOUNT,
]
stdout, stderr = self._run_mock_eb(args, do_build=True, raise_error=True, testing=False)
self.assertEqual(stderr.strip(), '')
expected_stdout = '\n'.join([
"Checking eligibility of easybuilders/easybuild-easyblocks PR #2805 for merging...",
"Checking eligibility of easybuilders/easybuild-easyblocks PR #2995 for merging...",
"* targets develop branch: OK",
"* test suite passes: OK",
"* no pending change requests: OK",
"* approved review: OK (by ocaisa)",
"* milestone is set: OK (4.6.2)",
"* approved review: OK (by boegel)",
"* milestone is set: OK (4.8.1)",
"* mergeable state is clean: PR is already merged",
'',
"Review OK, merging pull request!",
Expand Down

0 comments on commit 24d7862

Please sign in to comment.