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

Branch merges

Propose for merging

No branches dependent on this one.

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

Geoff Teale (community): Approve on 2013-04-22

Alberto Donato (community): Approve on 2013-04-19

Diff: 621 lines (+102/-93)

4 files modified

landscape/lib/amp.py (+46/-49)
landscape/lib/tests/test_amp.py (+52/-41)
landscape/tests/test_amp.py (+1/-1)
landscape/tests/test_configuration.py (+3/-2)

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

662. By Free Ekanayaka on 2013-04-19

Fix module docstring

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.

659. By Free Ekanayaka on 2013-04-15

Drop out-of-date Twisted trial hacks (fixed since Twisted 2.5, in hardy) [trivial] [r=cglass]

658. By Free Ekanayaka on 2013-04-15

Add successResultOf and failureResultOf to LandscapeTest, taken from Twisted 12.3.0 [trivial] [r=cglass]

657. By Free Ekanayaka on 2013-04-12

Merge reactor-cleanup [f=1168315] [r=tealeg,ack] [a=Free Ekanayaka]
This branch is actually a trivial change:

- Improve docstrings everywhere, mentioning the surprising behavior around
  the use of listen_unix in FakeReactor.

- Drop ThreadedCallsReactorMixin, which was meant to hold common functionality
  between TwistedReactor and FakeReactor, but had none. Its call_in_thread method
  has been moved to TwistedReactor while call_in_main to FakeReactor, where they
  are actually used.

- Move FakeReactor after TwistedReactor in the reactor.py file.

- Re-arrange the order of method definitions in both FakeReactor and TwistedReactor
  so they match.

- Drop udp-related methods, which we don't use.

656. By Free Ekanayaka on 2013-04-12

Better docstrings for broker test helpers [trivial] [r=tealeg]

655. By Free Ekanayaka on 2013-04-12

Merge exchange-token [f=1161856] [r=tribaal,ack] [a=Free Ekanayaka]
This branch implements the client-side part of the changes needed to detect cloned computers. The idea is that at each exchange the server will give the client a token that the client will be required to give back at the following exchange to prove that it's still the same client. If two clients with the same secure ID try to perform an exchange using the same token, only the first one that completes the exchange will succeed, because the second will not be authenticated since the token has changed in the meantime (after the first exchange completed).

654. By Free Ekanayaka on 2013-04-12

Add details to the module docstring for landscape.amp

653. By Free Ekanayaka on 2013-04-12

Add more detailed module docstring for landscape.lib.amp