Launchpad itself

Merge lp:~jml/launchpad/fix-ec2-demo into lp:launchpad

  1. fix-ec2-demo
  2. Merge into devel
Proposed by Jonathan Lange
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~jml/launchpad/fix-ec2-demo
Merge into: lp:launchpad
Diff against target: 12 lines
1 file modified
lib/devscripts/ec2test/builtins.py (+1/-1)
To merge this branch: bzr merge lp:~jml/launchpad/fix-ec2-demo
Reviewer Review Type Date Requested Status
Graham Binns (community) Approve
Review via email: mp+13461@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

This branch fixes a simple bug in 'ec2 demo'.

Previously I'd refactored the 'vals' dict out of ec2. This required more parameters to be passed to things explicitly. In particular, the launchpad-login now needs to be explicitly passed to EC2TestRunner in order for it to work.

The cmd_test command did this, but I failed to update the cmd_demo command. This branch addresses that.

Revision history for this message
Graham Binns (gmb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/devscripts/ec2test/builtins.py'
2--- lib/devscripts/ec2test/builtins.py 2009-10-09 16:39:47 +0000
3+++ lib/devscripts/ec2test/builtins.py 2009-10-16 11:15:26 +0000
4@@ -446,7 +446,7 @@
5 runner = EC2TestRunner(
6 test_branch, branches=branches,
7 include_download_cache_changes=include_download_cache_changes,
8- instance=instance)
9+ instance=instance, launchpad_login=instance._launchpad_login)
10
11 demo_network_string = '\n'.join(
12 ' ' + network for network in demo)