Skip to content

Allow info test to work with usernames w/dash #3667

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
Jul 30, 2019
Merged

Allow info test to work with usernames w/dash #3667

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 test/system/005-info.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RunRoot:
run_podman info --format=json

expr_nvr="[a-z0-9-]\\\+-[a-z0-9.]\\\+-[a-z0-9]\\\+\."
expr_path="/[a-z0-9\\\/.]\\\+\\\$"
expr_path="/[a-z0-9\\\-\\\/.]\\\+\\\$"
Copy link
Member

Choose a reason for hiding this comment

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

LGTM but just as a matter of readability (and I realize there is some difference of opinion about this) my eyes find it much easier to recognize dash-as-a-character when it's at the beginning or end of the character class:

   expr_path="/[a-z0-9\\\/.-]\\\+\\\$"       (with apologies for so many backslashes)

To me that makes it clear that the author explicitly meant the dash, and not a range. But I'm fine with this either way. Thanks for the fix.

Copy link
Contributor Author

@major major Jul 29, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

@edsantiago That's good to know. I'm happy to change it but I see a whole lot of checks running below. 😄

Copy link
Member

Choose a reason for hiding this comment

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

Yeah - don't annoy the CI gods. It's fine as it is, especially with all the backslashes to make it stand out. Thanks again.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was counting my backslashes very carefully... 🤠


tests="
host.BuildahVersion | [0-9.]
Expand Down