Skip to content

Commit

Permalink
Merge pull request #783 from hpc/run-results-error
Browse files Browse the repository at this point in the history
Run results error
  • Loading branch information
francinelapid authored Oct 3, 2024
2 parents 56c4a69 + c8e6d93 commit b443746
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: logs
if: always()
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: test_output
path: test/working_dir.zip
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
- name: logs
if: failure()
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: test_output_2.6
path: test/working_dir.zip
Expand Down Expand Up @@ -247,7 +247,7 @@ jobs:
- name: logs
if: failure()
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: test_output_2.10
path: test/working_dir.zip
5 changes: 4 additions & 1 deletion lib/pavilion/commands/_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,12 @@ def _run(self, test: TestRun):
except TestRunError as err:
# An unexpected TestRunError
test.status.set(STATES.RUN_ERROR, err)
return
except TimeoutError:
# This is expected
pass
test.status.set(STATES.RUN_ERROR,
f"Timed out waiting for test {test.name} to complete.")
return
except Exception:
# Some other unexpected exception.
test.status.set(
Expand Down
1 change: 1 addition & 0 deletions lib/pavilion/schedulers/plugins/flux.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# pylint: disable=too-many-lines
# pylint: disable=no-self-use
"""The Flux Framework Scheduler Plugin."""

import os
Expand Down
2 changes: 1 addition & 1 deletion test/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pylint
pylint==2.13.9
matplotlib > 3
2 changes: 1 addition & 1 deletion test/tests/utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def test_owner(self):
# Try to set the permissions of the file to an unknown user.
proc = sp.Popen(['sudo', '-n', 'chown', '12341', path.as_posix()],
stdout=sp.PIPE, stderr=sp.PIPE, stdin=sp.PIPE)
if proc.wait(1) == 0:
if proc.wait(2) == 0:
self.assertEqual(utils.owner(path), "<unknown user '12341'>")

def test_relative_to(self):
Expand Down

0 comments on commit b443746

Please sign in to comment.