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 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Björn Tillenius (community) | Approve | ||
Alberto Donato (community) | Approve | ||
🤖 Landscape Builder | test results | Approve | |
Review via email:
|
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.
Command: TRIAL_ARGS=-j4 make check /ci.lscape. net/job/ latch-test/ 5119/
Result: Success
Revno: 912
Branch: lp:~adam-collard/landscape-client/drop-mocker
Jenkins: https:/