Merge lp://staging/~freyes/maas-deployer/fix-ls into lp://staging/~maas-deployers/maas-deployer/next
Proposed by
Felipe Reyes
| Status: | Merged |
|---|---|
| Merged at revision: | 75 |
| Proposed branch: | lp://staging/~freyes/maas-deployer/fix-ls |
| Merge into: | lp://staging/~maas-deployers/maas-deployer/next |
| Diff against target: |
27 lines (+14/-3) 1 file modified
maas_deployer/tests/test_utils.py (+14/-3) |
| To merge this branch: | bzr merge lp://staging/~freyes/maas-deployer/fix-ls |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Billy Olsen | Approve | ||
|
Review via email:
|
|||
Description of the change
In Xenial the output of the path in ls for no such file or directory is
surrounded by single quotes, while in Trusty is not. This patch checks
for both possible outputs and if none is found, then the test is marked
as fail.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM