Landscape Client

Merge lp://staging/~adam-collard/landscape-client/mocker-replace-watchdog-service-tests into lp://staging/~landscape/landscape-client/trunk

  1. mocker-replace-watchdog-service-tests
  2. Merge into trunk
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 897
Merged at revision: 906
Proposed branch: lp://staging/~adam-collard/landscape-client/mocker-replace-watchdog-service-tests
Merge into: lp://staging/~landscape/landscape-client/trunk
Diff against target: 426 lines (+111/-204)
1 file modified
landscape/tests/test_watchdog.py (+111/-204)
To merge this branch: bzr merge lp://staging/~adam-collard/landscape-client/mocker-replace-watchdog-service-tests
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Bogdana Vereha (community) Approve
Alberto Donato Approve
🤖 Landscape Builder test results Approve
Review via email: mp+297688@code.staging.launchpad.net

Commit message

Move WatchDogServiceTest from mocker to mock.

Description of the change

Move WatchDogServiceTest from mocker to mock.

For the log rotation test, I moved it from WatchDogServiceTest to WatchDogTest and removed the testing of the log rotation itself (it's covered in test_log.py)

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
lp://staging/~adam-collard/landscape-client/mocker-replace-watchdog-service-tests updated
895. By Adam Collard

Remove stray mocker bits still leftover

Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 894
Branch: lp:~adam-collard/landscape-client/mocker-replace-watchdog-service-tests
Jenkins: https://ci.lscape.net/job/latch-test/5110/

review: Approve (test results)
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: 895
Branch: lp:~adam-collard/landscape-client/mocker-replace-watchdog-service-tests
Jenkins: https://ci.lscape.net/job/latch-test/5111/

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

+1

review: Approve
Revision history for this message
Bogdana Vereha (bogdana) wrote :

+1 with a minor comment inline

Revision history for this message
Bogdana Vereha (bogdana) :
review: Approve
Revision history for this message
Adam Collard (adam-collard) :
review: Approve
lp://staging/~adam-collard/landscape-client/mocker-replace-watchdog-service-tests updated
896. By Adam Collard

mark test as whitebox

897. By Adam Collard

Add pid_file checks (bogdana's review)

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: