lp:~free.ekanayaka/landscape-client/amp-cleanup-7

Branch merges

Propose for merging

No branches dependent on this one.

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

Chris Glass (community): Approve on 2013-05-02

Geoff Teale (community): Approve on 2013-05-02

Diff: 311 lines (+84/-131)

6 files modified

landscape/broker/tests/helpers.py (+16/-33)
landscape/package/tests/test_changer.py (+19/-24)
landscape/package/tests/test_releaseupgrader.py (+10/-14)
landscape/package/tests/test_reporter.py (+31/-43)
landscape/package/tests/test_taskhandler.py (+5/-9)
landscape/tests/helpers.py (+3/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1170669: Cleanup AMP-based machinery

High

Fix Released

Link a bug report

Related blueprints

669. By Free Ekanayaka on 2013-05-02

Merge from amp-cleanup-6

668. By Free Ekanayaka on 2013-04-30

Merge from amp-cleanup-6

667. By Free Ekanayaka on 2013-04-23

Synchronous test helpers

666. By Free Ekanayaka on 2013-04-23

Don't use real listenUNIX and connectUNIX within FakeReactor

665. By Free Ekanayaka on 2013-04-22

Drop unused protocol classes

664. By Free Ekanayaka on 2013-04-22

Use ComponentPublisher in the usermonitor and usermanager plugins

663. By Free Ekanayaka on 2013-04-19

Add ComponentPublisher and dropped ComponentProtocolFactory

662. By Free Ekanayaka on 2013-04-19

Move features from RemoteBrokerConnector to MethodCallClientFactory

661. By Free Ekanayaka on 2013-04-18

Expose MethodCallSender _protocol and _clock attributes

660. By Free Ekanayaka on 2013-04-16

Merge testable-amp [f=1169102] [r=ack,tealeg] [a=Free Ekanayaka]
This is a first step towards having synchronous tests for AMP-related code:

- Use composition vs inheritance, so MethodCallServerProtocol has now become
  MethodCallReceiver and MethodCallClientProtocol has become MethodCallSender.
  They don't inherit from the base AMP protocol anymore, this will let us mock
  the AMP protocol itself later on.

- Put in place temporary workarounds (marked with "XXX") for the few breakages
  that such refactoring causes. These will be cleaned up in a follow-up branch.

- Changed most of the tests in l/lib/tests/test_amp.py to be synchronous and not
  use the real Twisted reactor. This is done by faking the transport, so we can
  simulate a connection rather than use real Unix sockets. These methods don't
  need to return deferreds anymore in order to perform their assertions, as
  they can trust that everything happens synchronously.