lp:~gmb/charms/oneiric/buildbot-master/master-smart-timeouts

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~yellow/charms/oneiric/buildbot-master/trunk at revision 29

Brad Crittenden (community): Approve on 2012-02-13

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

34. By Graham Binns on 2012-02-13

Some tweaks.

33. By Graham Binns on 2012-02-13

Review changes for Brad.

32. By Graham Binns on 2012-02-13

Merged trunk.

31. By Graham Binns on 2012-02-12

Removed an unused import.

30. By Graham Binns on 2012-02-12

Fixed wait_for_machine so that it doesn't always timeout (which was unhelpful) and removed pdb calls.

29. By Graham Binns on 2012-02-12

Undid last change.

28. By Graham Binns on 2012-02-12

Wait for 'state' == 'running' instead of 'instance-state'.

27. By Graham Binns on 2012-02-12

Tweaked wait_for_machine so that it won't always timeout on LXC; instead it will return early.

26. By Graham Binns on 2012-02-12

Added a wait_for_machine() helper (which may only work properly with EC2 environments). All tests except test_lpbuildbot now pass, and I'll tackle that in a separate branch.

25. By Graham Binns on 2012-02-10

Checkpoint for test fixes with Benji.