-
Notifications
You must be signed in to change notification settings - Fork 21
Conversation
This is the follow on to projectatomic#288 to address projectatomic#239. projectatomic#288 addressed the error messages in the roles and this commit addresses the error messages in the tests itself.
bot, retest this please |
I just realized that this is going to run every test we have and most likely it will timeout/fail. |
tests/admin-unlock/main.yml
Outdated
msg: | | ||
Expected: Error message should indicated the deployment is already in | ||
the unlocked state: development | ||
Actual: double_unlock.stderr |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need double curly braces here? It probably works without them, but adding them would be consistent elsewhere.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I missed that one! I think it would actually print out the literal double_unlock.stderr
msg: | | ||
Expected: {{ g_invalid_pkg }} is not currently requested in rpm-ostree | ||
uninstall output | ||
Actual: {{ uninstall.stderr }} | ||
when: "'\\'{{ g_invalid_pkg }}\\' is not currently requested' not in uninstall.stderr" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As an aside unrelated to the changes here, this conditional looks ugly as sin. I wonder if we can improve it....
tests/system-containers/main.yml
Outdated
msg: "/var/lib/containers/atomic/{{ g_hw_name }}/rootfs does not exist" | ||
msg: | | ||
Expected: /var/lib/containers/atomic/{{ g_hw_name }}/rootfs exists is True | ||
Actual: /var/lib/containers/atomic/{{{ g_hw_name }}/rootfs exists is {{ hw.stat.exists }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extra opening curly brace
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm surprised Ansible didn't choke on this when I tested the test
tests/rpm-ostree/main.yml
Outdated
msg: "Initramfs args are incorrect. Expected /etc/rpmostree-file. Actual {{ ros_booted['initramfs-args'][1] }}" | ||
msg: | | ||
Expected: /etc/rpmostree-file in rpm-ostree initramfs-args | ||
Actual: {{ ros_booted['initramfs-args'][1] }}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extra double quote at the end of the line
Looks good overall. Just a couple of nits and we can probably merge this in. |
Just pushed a fixup. Thanks for the review! Ansible seems a little looser when you use the |
None of the CI failures are due to the change itself, so this is good to merge. Thanks for continuing the cleanup! |
This is the follow on to #288 to address #239. #288 addressed the
error messages in the roles and this commit addresses the error
messages in the tests themselves.