Skip to content
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.

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

bugfix/celery-chord-error #481

Merged
merged 23 commits into from
Jun 5, 2024
Merged
Changes from 4 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7888493
resolve CHANGELOG conflict
bgunnar5 Aug 4, 2023
ec13acf
Merge branch 'develop' of https://github.com/LLNL/merlin into develop
bgunnar5 Aug 4, 2023
7c59fc2
merge latest changes from develop
bgunnar5 Nov 20, 2023
29573d4
remove a merge conflict statement that was missed
bgunnar5 Nov 20, 2023
d4a33a6
Merge branch 'develop' of https://github.com/LLNL/merlin into develop
bgunnar5 Jan 25, 2024
dc224b5
Merge branch 'develop' of https://github.com/LLNL/merlin into develop
bgunnar5 Jan 25, 2024
54af2b6
Merge branch 'develop' of https://github.com/LLNL/merlin into develop
bgunnar5 Mar 11, 2024
0849acc
Merge branch 'develop' of https://github.com/bgunnar5/merlin into dev…
bgunnar5 May 16, 2024
b44e285
Merge branch 'develop' of https://github.com/bgunnar5/merlin into dev…
bgunnar5 May 16, 2024
358568e
Merge branch 'LLNL:develop' into develop
bgunnar5 May 23, 2024
adc4ebb
add celery results backend patch to stop ChordErrors
bgunnar5 May 24, 2024
3426db3
add MERLIN_RAISE_ERROR return code
bgunnar5 May 24, 2024
07f558c
add tests to ensure chord error isn't raised
bgunnar5 May 24, 2024
fe1d4d9
add RAISE_ERROR to docs
bgunnar5 May 24, 2024
33a1551
update CHANGELOG
bgunnar5 May 24, 2024
1b9d907
fix lint issues
bgunnar5 May 24, 2024
db2924e
up the sleep time on the chord error test
bgunnar5 May 24, 2024
547d6d3
add new steps to the chord err test spec
bgunnar5 May 24, 2024
4745ab7
add tree statement to the new test for debugging
bgunnar5 May 28, 2024
9933f06
upping sleep time to see if that fixes github action for python 3.7
bgunnar5 May 28, 2024
2e12d40
change sleep time for new test based on python version
bgunnar5 May 28, 2024
e003d98
run fix style
bgunnar5 May 28, 2024
c4043f0
remove specific sleep time for diff python versions
bgunnar5 May 29, 2024
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
22 changes: 21 additions & 1 deletion tests/integration/definitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"""

import shutil
import sys

# Pylint complains that we didn't install this module but it's defined locally so ignore
from conditions import ( # pylint: disable=E0401
Expand All @@ -63,6 +64,24 @@
KILL_WORKERS = "pkill -9 -f '.*merlin_test_worker'"


def is_python_version_above_37() -> bool:
"""
Check if the python version is above or below 3.7.

:returns: True if python version is 3.8+. False otherwise.
"""
if sys.version_info.major > 3:
return True
if sys.version_info.major < 3:
return False

# If we're here then the major version is 3
if sys.version_info.minor >= 8:
return True

return False


def get_worker_by_cmd(cmd: str, default: str) -> str:
"""
Given a command used by a scheduler (e.g. flux for flux, jsrun for lsf, etc.)
Expand Down Expand Up @@ -832,7 +851,8 @@ def define_tests(): # pylint: disable=R0914,R0915
"check chord error continues wf": {
"cmds": [
f"{workers} {chord_err_wf} --vars OUTPUT_PATH=./{OUTPUT_DIR}",
f"{run} {chord_err_wf} --vars OUTPUT_PATH=./{OUTPUT_DIR}; sleep 10",
f"""{run} {chord_err_wf} --vars OUTPUT_PATH=./{OUTPUT_DIR};
sleep {10 if is_python_version_above_37() else 30}; tree {OUTPUT_DIR}""",
bgunnar5 marked this conversation as resolved.
Show resolved Hide resolved
],
"conditions": [
HasReturnCode(),
Expand Down
Loading