Skip to content

[bugfix] Fix crash in failure report when test is killed due to timeout #680

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
merged 5 commits into from
Feb 18, 2019
Merged

[bugfix] Fix crash in failure report when test is killed due to timeout #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d4afa5
Fix string conversion of 'SpawnedProcessTimeout'
Feb 14, 2019
5970e42
Replace bare 'except' with a 'except TypeError'
Feb 14, 2019
1c2a12c
Address PR comments
Feb 15, 2019
273ae34
Minor style changes
Feb 15, 2019
bf65671
Merge branch 'master' into bugfix/process_timeout
vkarak Feb 18, 2019
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
4 changes: 2 additions & 2 deletions reframe/utility/os_ext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ def run_command(cmd, check=False, timeout=None, shell=False):
except subprocess.TimeoutExpired as e:
os.killpg(proc.pid, signal.SIGKILL)
raise SpawnedProcessTimeout(e.cmd,
proc.stdout,
proc.stderr, timeout) from None
proc.stdout.read(),
proc.stderr.read(), timeout) from None

completed = subprocess.CompletedProcess(args=shlex.split(cmd),
returncode=proc.returncode,
Expand Down
5 changes: 4 additions & 1 deletion unittests/test_utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@ def test_command_error(self):
def test_command_timeout(self):
try:
os_ext.run_command('sleep 3', timeout=2)
self.fail('Expected timeout')
except SpawnedProcessTimeout as e:
self.assertEqual(e.timeout, 2)
# Try to get the string repr. of the exception: see bug #658
s = str(e)
else:
self.fail('expected timeout')

def test_command_async(self):
from datetime import datetime
Expand Down