lp://qastaging/~adam-collard/landscape-client/mocker-replace-configuration

Branch merges

Propose for merging

No branches dependent on this one.

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

Chad Smith: Approve on 2016-06-15

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

Chris Glass (community): Approve on 2016-06-15

Diff: 916 lines (+289/-365)

1 file modified

landscape/tests/test_configuration.py (+289/-365)

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

848. By Adam Collard on 2016-06-15

Assert that show_help is only called once (bbsw's review)

847. By Adam Collard on 2016-06-15

Use [call] for tuple unpacking rather than call, (bbsw's review)

846. By Adam Collard on 2016-06-15

Replace excessive @mock.patch with inline monkey patching

845. By Adam Collard on 2016-06-15

Merge from trunk

844. By Adam Collard on 2016-06-15

Replace use of mocker with mock in LandscapeSetupScript

843. By Adam Collard on 2016-06-15

Replace mocker for PrintTextTest

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)