Rev 3: Install zlib too and stop starting up spurious instances. in http://people.ubuntu.com/~robertc/baz2.0/plugins/ec2test/trunk

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugins/ec2test/trunk

------------------------------------------------------------
revno: 3
revision-id: robertc at robertcollins.net-20090407062346-m570v4upvn3hd1lj
parent: robertc at robertcollins.net-20090401042500-qofle73piw3zf11v
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Tue 2009-04-07 16:23:46 +1000
message:
  Install zlib too and stop starting up spurious instances.
=== modified file '__init__.py'
--- a/__init__.py	2009-04-01 04:25:00 +0000
+++ b/__init__.py	2009-04-07 06:23:46 +0000
@@ -102,7 +102,7 @@
                 "apt-get update > /dev/null",
                 "apt-get install -y bzr python python2.5-dev "
                 "python-docutils graphviz xdg-utils python-pyrex "
-                "python-medusa 2>&1 > /dev/null",
+                "python-medusa zlib1g-dev 2>&1 > /dev/null",
                 "mkdir -p ~/.bazaar/plugins/ > /dev/null",
                 "bzr branch lp:subunit subunit 2>&1 > /dev/null",
                 "adduser bzrtest --disabled-password < /dev/null",
@@ -166,10 +166,11 @@
                 # TODO: random name ?
                 transport.put_bytes_non_atomic('test_list.bz2', test_list_bz2)
                 ir, connection = self.run_script('bzrtest', ['bash', 'test.sh'])
-                print self.instance.dns_name
+                print "Starting tests on ", self.instance.dns_name
                 self._stream = ir
                 self.connection = connection
                 ProtocolTestCase.run(self, result)
+                print "Finished tests on ", self.instance.dns_name
             finally:
                 # NB: ctrl-C does not yet trigger cleanup().
                 self.cleanup()
@@ -213,7 +214,9 @@
                         pass
                     except Exception:
                         note("unusable instance %r" % instance)
+        missing_instances = concurrency - len(instances)
         if missing_instances:
+            print "starting %d instances" % missing_instances
             # ami-bdfe19d4 is Eric Hammonds 64-bit Ubuntu image
             # http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1762&categoryID=101
             # TODO use ec2_conn.get_all_instances() to get current reservations and use