Merge lp:~jml/launchpad/more-tests-for-ec2 into lp:launchpad

[Jonathan Lange]

Add some unit tests for the script we run on ec2 instances.

What with all of the recent bugs and what-not with hangs and disappearing emails from ec2 test, I thought it would be a good idea to start getting some unit tests for the script that we run remotely on the foreign server.

This means renaming the script in the tree so we can import it and actually adding some unit tests.

I did this work when I was offline and didn't have anything strategic I could do without Internet. My net connection came back quicker than expected and I only got one unit test written.

Still, it's a start, and removes any excuse any further ec2 test tinkerers might have about not writing tests.

[Gavin Panella (allenap)]

review: Approve

=== renamed file 'lib/devscripts/ec2test/ec2test-remote.py' => 'lib/devscripts/ec2test/remote.py'
=== modified file 'lib/devscripts/ec2test/testrunner.py'
--- lib/devscripts/ec2test/testrunner.py	2010-04-19 14:59:03 +0000
+++ lib/devscripts/ec2test/testrunner.py	2010-04-28 12:02:35 +0000
@@ -336,10 +336,10 @@
                     'smtp_password = %s\n' % (self._smtp_password,))
             bazaar_conf_file.close()
         # Copy remote ec2-remote over
-        self.log('Copying ec2test-remote.py to remote machine.\n')
+        self.log('Copying remote.py to remote machine.\n')
         user_connection.sftp.put(
-            os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                         'ec2test-remote.py'),
+            os.path.join(
+                os.path.dirname(os.path.realpath(__file__)), 'remote.py'),
             '/var/launchpad/ec2test-remote.py')
         # Set up launchpad login and email
         as_user('bzr launchpad-login %s' % (self._launchpad_login,))

=== added file 'lib/devscripts/ec2test/tests/test_remote.py'
--- lib/devscripts/ec2test/tests/test_remote.py	1970-01-01 00:00:00 +0000
+++ lib/devscripts/ec2test/tests/test_remote.py	2010-04-28 12:02:35 +0000
@@ -0,0 +1,29 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for the script run on the remote server."""
+
+__metaclass__ = type
+
+from StringIO import StringIO
+import unittest
+
+from devscripts.ec2test.remote import SummaryResult
+
+
+class TestSummaryResult(unittest.TestCase):
+    """Tests for `SummaryResult`."""
+
+    def test_printError(self):
+        # SummaryResult.printError() prints out the name of the test, the kind
+        # of error and the details of the error in a nicely-formatted way.
+        stream = StringIO()
+        result = SummaryResult(stream)
+        result.printError('FOO', 'test', 'error')
+        expected = '%sFOO: test\n%serror\n' % (
+            result.double_line, result.single_line)
+        self.assertEqual(expected, stream.getvalue())
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)