Merge lp://staging/~bigkevmcd/landscape-client/bug-710621-exit-more-gracefully into lp://staging/~landscape/landscape-client/trunk

Proposed by Kevin McDermott
Status: Merged
Approved by: Frank Wierzbicki
Approved revision: 317
Merged at revision: 316
Proposed branch: lp://staging/~bigkevmcd/landscape-client/bug-710621-exit-more-gracefully
Merge into: lp://staging/~landscape/landscape-client/trunk
Diff against target: 40 lines (+15/-1)
2 files modified
landscape/sysinfo/deployment.py (+5/-1)
landscape/sysinfo/tests/test_deployment.py (+10/-0)
To merge this branch: bzr merge lp://staging/~bigkevmcd/landscape-client/bug-710621-exit-more-gracefully
Reviewer Review Type Date Requested Status
Frank Wierzbicki (community) Approve
Björn Tillenius (community) Approve
Review via email: mp+48879@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Björn Tillenius (bjornt) wrote :

Looks good to me, +1!

[1]

+ self.assertEqual(error.message,
+ "Unable to setup logging. Read-only filesystem.")

I would say that the expected output should be the first argument, but I'm fine with leaving it as it is, to keep it consistent with the rest of the tests in this file.

review: Approve
Revision history for this message
Frank Wierzbicki (fwierzbicki) wrote :

Some pep8 lints:

landscape/sysinfo/tests/test_deployment.py:237:48: E225 missing whitespace around operator
landscape/sysinfo/tests/test_deployment.py:285:80: E501 line too long (87 characters)

otherwise, looks good to me +1!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: