Skip to content

[bugfix] Fix regex pattern for matching node lists #2379

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 1 commit into from
Jan 17, 2022
Merged

[bugfix] Fix regex pattern for matching node lists #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion reframe/utility/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ def _rl_encode(seq):


def _parse_node(nodename):
m = re.search(r'(^\D+)(\d+)', nodename)
m = re.search(r'(.*\D)(\d+)', nodename)
if m is None:
basename = nodename
width = 0
Expand Down
4 changes: 4 additions & 0 deletions unittests/test_utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,6 +1784,10 @@ def test_nodelist_abbrev():
assert nodelist([]) == ''
assert nodelist(['nid001']) == 'nid001'

# Test host names with numbers in their basename (see GH #2357)
nodes = [f'c2-01-{n:02}' for n in range(100)]
assert nodelist(nodes) == 'c2-01-[00-99]'

# Test node duplicates
assert nodelist(['nid001', 'nid001', 'nid002']) == 'nid001,nid00[1-2]'

Expand Down