also pick up on --github-org in sync_branch_with_develop + fix patterns in test_sync_branch_with_develop

Author: boegel

easybuild/tools/github.py

@@ -2044,9 +2044,12 @@ def sync_branch_with_develop(branch_name):
     git_working_dir = tempfile.mkdtemp(prefix='git-working-dir')
     git_repo = init_repo(git_working_dir, target_repo)
 
-    setup_repo(git_repo, github_user, target_repo, branch_name)
+    # GitHub organisation or GitHub user where branch is located
+    github_account = build_option('github_org') or github_user
+
+    setup_repo(git_repo, github_account, target_repo, branch_name)
 
     sync_with_develop(git_repo, branch_name, target_account, target_repo)
 
     # push updated branch back to GitHub (unless we're doing a dry run)
-    return push_branch_to_github(git_repo, github_user, target_repo, branch_name)
+    return push_branch_to_github(git_repo, github_account, target_repo, branch_name)

test/framework/options.py

@@ -3168,18 +3168,20 @@ def test_sync_branch_with_develop(self):
             '--sync-branch-with-develop=%s' % test_branch,
             '--dry-run',
         ]
-        txt, _ = self._run_mock_eb(args, do_build=True, raise_error=True, testing=False)
+        stdout, stderr = self._run_mock_eb(args, do_build=True, raise_error=True, testing=False)
+
+        self.assertFalse(stderr)
 
         github_path = r"boegel/easybuild-easyconfigs\.git"
         pattern = '\n'.join([
             r"== temporary log file in case of crash .*",
             r"== fetching branch '%s' from https://github\.com/%s\.\.\." % (test_branch, github_path),
             r"== pulling latest version of 'develop' branch from easybuilders/easybuild-easyconfigs\.\.\.",
-            r"== merging 'develop' branch into PR branch 'develop'\.\.\.",
-            r"== pushing branch 'develop' to remote '.*' \(git@github\.com:%s\) \[DRY RUN\]" % github_path,
+            r"== merging 'develop' branch into PR branch '%s'\.\.\." % test_branch,
+            r"== pushing branch '%s' to remote '.*' \(git@github\.com:%s\) \[DRY RUN\]" % (test_branch, github_path),
         ])
         regex = re.compile(pattern)
-        self.assertTrue(regex.match(txt), "Pattern '%s' doesn't match: %s" % (regex.pattern, txt))
+        self.assertTrue(regex.match(stdout), "Pattern '%s' doesn't match: %s" % (regex.pattern, stdout))
 
     def test_new_pr_python(self):
         """Check generated PR title for --new-pr on easyconfig that includes Python dependency."""