@@ -4751,14 +4751,15 @@ def test_github_merge_pr(self):
47514751
47524752 expected_stdout = '\n ' .join ([
47534753 "Checking eligibility of easybuilders/easybuild-easyconfigs PR #4781 for merging..." ,
4754- "* test suite passes: OK" ,
47554754 "* last test report is successful: OK" ,
47564755 "* no pending change requests: OK" ,
47574756 "* milestone is set: OK (3.3.1)" ,
47584757 "* mergeable state is clean: PR is already merged" ,
47594758 ])
47604759 expected_stderr = '\n ' .join ([
47614760 "* targets some_branch branch: FAILED; found 'develop' => not eligible for merging!" ,
4761+ # since commit status for old PRs is no longer available, so test suite check fails
4762+ "* test suite passes: (status: None) => not eligible for merging!" ,
47624763 "* approved review: MISSING => not eligible for merging!" ,
47634764 '' ,
47644765 "WARNING: Review indicates this PR should not be merged (use -f/--force to do so anyway)" ,
@@ -4768,24 +4769,24 @@ def test_github_merge_pr(self):
47684769
47694770 # full eligible merged PR, default target branch
47704771 del args [- 1 ]
4771- args [1 ] = '4832 '
4772+ args [1 ] = '17065 '
47724773
47734774 stdout , stderr = self ._run_mock_eb (args , do_build = True , raise_error = True , testing = False )
47744775
47754776 expected_stdout = '\n ' .join ([
4776- "Checking eligibility of easybuilders/easybuild-easyconfigs PR #4832 for merging..." ,
4777+ "Checking eligibility of easybuilders/easybuild-easyconfigs PR #17065 for merging..." ,
47774778 "* targets develop branch: OK" ,
47784779 "* test suite passes: OK" ,
47794780 "* last test report is successful: OK" ,
47804781 "* no pending change requests: OK" ,
4781- "* approved review: OK (by wpoely86 )" ,
4782- "* milestone is set: OK (3.3 .1)" ,
4782+ "* approved review: OK (by SebastianAchilles )" ,
4783+ "* milestone is set: OK (4.7 .1)" ,
47834784 "* mergeable state is clean: PR is already merged" ,
47844785 '' ,
47854786 "Review OK, merging pull request!" ,
47864787 '' ,
4787- "[DRY RUN] Adding comment to easybuild-easyconfigs issue #4832 : 'Going in, thanks @boegel!'" ,
4788- "[DRY RUN] Merged easybuilders/easybuild-easyconfigs pull request #4832 " ,
4788+ "[DRY RUN] Adding comment to easybuild-easyconfigs issue #17065 : 'Going in, thanks @boegel!'" ,
4789+ "[DRY RUN] Merged easybuilders/easybuild-easyconfigs pull request #17065 " ,
47894790 ])
47904791 expected_stderr = ''
47914792 self .assertEqual (stderr .strip (), expected_stderr )
@@ -4794,20 +4795,20 @@ def test_github_merge_pr(self):
47944795 # --merge-pr also works on easyblocks (& framework) PRs
47954796 args = [
47964797 '--merge-pr' ,
4797- '1206 ' ,
4798+ '2805 ' ,
47984799 '--pr-target-repo=easybuild-easyblocks' ,
47994800 '-D' ,
48004801 '--github-user=%s' % GITHUB_TEST_ACCOUNT ,
48014802 ]
48024803 stdout , stderr = self ._run_mock_eb (args , do_build = True , raise_error = True , testing = False )
48034804 self .assertEqual (stderr .strip (), '' )
48044805 expected_stdout = '\n ' .join ([
4805- "Checking eligibility of easybuilders/easybuild-easyblocks PR #1206 for merging..." ,
4806+ "Checking eligibility of easybuilders/easybuild-easyblocks PR #2805 for merging..." ,
48064807 "* targets develop branch: OK" ,
48074808 "* test suite passes: OK" ,
48084809 "* no pending change requests: OK" ,
4809- "* approved review: OK (by migueldiascosta )" ,
4810- "* milestone is set: OK (3.3.1 )" ,
4810+ "* approved review: OK (by ocaisa )" ,
4811+ "* milestone is set: OK (4.6.2 )" ,
48114812 "* mergeable state is clean: PR is already merged" ,
48124813 '' ,
48134814 "Review OK, merging pull request!" ,
0 commit comments