lp://qastaging/~chad.smith/landscape-client/mocker-to-mock-computer-uptime

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~landscape/landscape-client/trunk at revision 866

Simon Poirier (community): Approve on 2016-06-15

Free Ekanayaka (community): Approve on 2016-06-15

🤖 Landscape Builder: Approve (test results) on 2016-06-15

Chad Smith: Approve on 2016-06-15

Diff: 28 lines (+3/-4)

1 file modified

landscape/monitor/tests/test_computeruptime.py (+3/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1592875: remove mocker

Medium

Fix Committed

Link a bug report

Related blueprints

846. By Chad Smith on 2016-06-15

save the world one mock at a time

845. By Benji York on 2016-06-15

Merge remove-mocker-test_usermanager [f=1592875] [r=benji,tealeg,bogdana] [a=Benji York]
This branch removes Mocker usage from landscape/manager/tests/test_usermanager.py.

844. By Bogdana Vereha on 2016-06-15

Merge mocker-test-service [f=1592875] [r=bogdana,danilo,chad.smith] [a=Bogdana Vereha]
Port broker.test_service.
This test used to just hang (timeout?) instead of failing before, so just checking if the methods were called seemed like a better way.

843. By Chad Smith on 2016-06-15

Merge mocker-to-mock-cephusage [f=1592875] [r=benji,tealeg] [a=Chad Smith]
Use mock instead of mocker for cephusage unit tests.

842. By Benji York on 2016-06-01

Merge more-mock [f=] [r=chad.smith,ack] [a=Benji York]
This branch translates all of the Mocker-using tests in
landscape/broker/tests/test_server.py into (backported to Python 2)
unittest.mock-using tests.

841. By Benji York on 2016-06-01

Merge new-mock-first-try [f=] [r=benji,adam-collard,ack] [a=Benji York]
This branch is the first baby-step towards replacing Mocker in the
client tests with unittest.mock (more specifically, the Python2
backport "mock").

840. By Bogdana Vereha on 2016-04-05

Merge swift-reporting [f=1563565] [r=danilo,adam-collard] [a=Bogdana Vereha]
Fix device enconding for swiftusage.

839. By Bogdana Vereha on 2016-04-04

Merge swift-reporting [f=1563565] [r=ahasenack,free.ekanayaka] [a=Bogdana Vereha]
Fix swift reporting by using the correct response format from Scout.scout()
As the bug mentioned, the response changed from (recon url, response body, and status code) to (recon url, response body, status code, time start and time end)

838. By Alberto Donato on 2016-03-23

Drop leftover comment [trivial] [r=free.ekanayaka].

837. By Alberto Donato on 2016-03-22

Merge fix-package-rules [f=1560424] [r=free.ekanayaka,adam-collard] [a=Alberto Donato]
This fixes rules for landscape-client/landscape-common packages which were causing the landscape-client package being removed when performing a dist-upgrade.
With the new rules, only ui packages (landscape-client-ui and landscape-client-ui-install) are removed, which is the intended behavior.