Merge lp://qastaging/~adam-collard/landscape-client/drop-mocker into lp://qastaging/~landscape/landscape-client/trunk

Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 912
Merged at revision: 912
Proposed branch: lp://qastaging/~adam-collard/landscape-client/drop-mocker
Merge into: lp://qastaging/~landscape/landscape-client/trunk
Diff against target: 2287 lines (+51/-2164)
3 files modified
Makefile (+1/-1)
landscape/tests/helpers.py (+50/-8)
landscape/tests/mocker.py (+0/-2155)
To merge this branch: bzr merge lp://qastaging/~adam-collard/landscape-client/drop-mocker
Reviewer Review Type Date Requested Status
Björn Tillenius (community) Approve
Alberto Donato (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+297776@code.qastaging.launchpad.net

Commit message

Actually drop our copy of mocker.

Move makeFile and makeDir into LandscapeTest with slight tweaks to do the unconditional removal of files in cleanup (I used shutil.rmtree even if it's a file just to get a convenient ignore of errors for files that are removed by the tests themselves)

Description of the change

Actually drop our copy of mocker.

Move makeFile and makeDir into LandscapeTest with slight tweaks to do the unconditional removal of files in cleanup (I used shutil.rmtree even if it's a file just to get a convenient ignore of errors for files that are removed by the tests themselves)

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 912
Branch: lp:~adam-collard/landscape-client/drop-mocker
Jenkins: https://ci.lscape.net/job/latch-test/5119/

review: Approve (test results)
Revision history for this message
Alberto Donato (ack) wrote :

Nice, +1

review: Approve
Revision history for this message
Björn Tillenius (bjornt) wrote :

+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: