Merge pull request #3583 from boegel/fix_github_tests

fix failing GitHub tests due to trivial change in output of 'eb' command

Author: ocaisa

.github/workflows/unit_tests.yml

@@ -100,12 +100,20 @@ jobs:
         # see https://github.com/<username>/easybuild-framework/settings/secrets
         GITHUB_TOKEN: ${{secrets.TEST_GITHUB_TOKEN}}
       run: |
-        if [ ! -z $GITHUB_TOKEN ]; then
-          if [ "x${{matrix.python}}" == 'x2.6' ];
+        # don't install GitHub token when testing with Lmod 7.x or non-Lmod module tools,
+        # to avoid hitting GitHub rate limit;
+        # tests that require a GitHub token are skipped automatically when no GitHub token is available
+        if [[ ! "${{matrix.modules_tool}}" =~ 'Lmod-7' ]] && [[ ! "${{matrix.modules_tool}}" =~ 'modules-' ]]; then
+          if [ ! -z $GITHUB_TOKEN ]; then
+            if [ "x${{matrix.python}}" == 'x2.6' ];
               then SET_KEYRING="keyring.set_keyring(keyring.backends.file.PlaintextKeyring())";
               else SET_KEYRING="import keyrings; keyring.set_keyring(keyrings.alt.file.PlaintextKeyring())";
-          fi;
-          python -c "import keyring; $SET_KEYRING; keyring.set_password('github_token', 'easybuild_test', '$GITHUB_TOKEN')";
+            fi;
+            python -c "import keyring; $SET_KEYRING; keyring.set_password('github_token', 'easybuild_test', '$GITHUB_TOKEN')";
+          fi
+          echo "GitHub token installed!"
+        else
+          echo "Installation of GitHub token skipped!"
         fi
 
     - name: install modules tool

test/framework/options.py

@@ -4184,7 +4184,7 @@ def test_sync_pr_with_develop(self):
 
         github_path = r"boegel/easybuild-easyconfigs\.git"
         pattern = '\n'.join([
-            r"== temporary log file in case of crash .*",
+            r"== Temporary log file in case of crash .*",
             r"== Determined branch name corresponding to easybuilders/easybuild-easyconfigs PR #9150: develop",
             r"== fetching branch 'develop' from https://github\.com/%s\.\.\." % github_path,
             r"== pulling latest version of 'develop' branch from easybuilders/easybuild-easyconfigs\.\.\.",
@@ -4215,7 +4215,7 @@ def test_sync_branch_with_develop(self):
 
         github_path = r"boegel/easybuild-easyconfigs\.git"
         pattern = '\n'.join([
-            r"== temporary log file in case of crash .*",
+            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 '%s'\.\.\." % test_branch,