Skip to content

[bugfix] Filter out empty strings before writing preamble #410

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 6 commits into from
Aug 23, 2018
Merged

[bugfix] Filter out empty strings before writing preamble #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30fa6b4
Filter out empty strings before writing shell
Jul 26, 2018
bc2fe46
Filter empty strings before emitting preable
Aug 2, 2018
78e973f
Address PR comments
Aug 9, 2018
89e12a8
Addres PR comments (version 2)
Aug 9, 2018
8196f39
Address PR comments (version 3)
Aug 12, 2018
14b2be1
Merge branch 'master' into bugfix/empty_lines_shell
vkarak Aug 16, 2018
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
3 changes: 2 additions & 1 deletion reframe/core/schedulers/slurm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ def emit_preamble(self):
else:
preamble.append(opt)

return preamble
# Filter out empty statements before returning
return list(filter(None, preamble))

def _run_command(self, cmd, timeout=None):
"""Run command cmd and re-raise any exception as a JobError."""
Expand Down
2 changes: 1 addition & 1 deletion reframe/core/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import abc


_RFM_TRAP_ERROR = '''
_RFM_TRAP_ERROR = r'''
Copy link
Contributor

@vkarak vkarak Jul 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: Which python version are you running and you're getting the string warnings?

Copy link
Contributor Author

@teojgo teojgo Jul 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pycodestyle shows me the warnings regarding invalid escape sequences. You must run with warnings enabled in order to take then from Python.

_onerror()
{
exitcode=$?
Expand Down
4 changes: 4 additions & 0 deletions unittests/test_schedulers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ def test_poll_before_submit(self):
self.testjob.prepare(self.commands, self.environs)
self.assertRaises(JobNotStartedError, self.testjob.finished)

def test_no_empty_lines_in_preamble(self):
Copy link
Contributor

@vkarak vkarak Aug 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be part of the _TestJob base class. Subclasses need not re-implement this, since it should be the same everywhere.

for l in self.testjob.emit_preamble():
self.assertNotEqual(l, '')


class TestLocalJob(_TestJob, unittest.TestCase):
def assertProcessDied(self, pid):
Expand Down