Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocaisa merged 3 commits into from
Feb 19, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01e3329
don't install GitHub token when testing with Lmod 7.x or non-Lmod mod…
boegel Feb 19, 2021
b5097d1
fix failing GitHub tests due to trivial change in output of 'eb' command
boegel Feb 19, 2021
4add76f
print message to make it clear whether GitHub token was installed or not
boegel Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions .github/workflows/unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/framework/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\.\.\.",
Expand Down Expand Up @@ -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,
Expand Down