Merge lp:~pwlars/lava-test/test-id-after-run into lp:lava-test/0.0

[Paul Larson]

Add output at the end of test runs to let the user know the result id

[James Westby (james-w)]

review: Approve

=== modified file 'abrek/testdef.py'
--- abrek/testdef.py	2010-10-07 15:44:19 +0000
+++ abrek/testdef.py	2010-10-15 15:12:59 +0000
@@ -75,6 +75,8 @@
             self.uninstall()
             raise RuntimeError("An error was detected during",
                 "installation, cleaning up: %s" % strerror)
+        finally:
+            os.chdir(self.origdir)
 
     def uninstall(self):
         """Uninstall the test suite.
@@ -122,6 +124,9 @@
         os.chdir(installdir)
         self.runner.run(self.resultsdir, quiet=quiet)
         self._savetestdata()
+        os.chdir(self.origdir)
+        print("ABREK TEST RUN COMPLETE: Result id is '%s'" %
+            os.path.basename(self.resultsdir))
 
     def parse(self, resultname):
         if not self.parser:
@@ -131,6 +136,7 @@
         resultsdir = os.path.join(config.resultsdir, resultname)
         os.chdir(resultsdir)
         self.parser.parse()
+        os.chdir(self.origdir)
 
 
 class AbrekTestInstaller(object):

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2010-09-15 20:28:14 +0000
+++ tests/__init__.py	2010-10-15 15:12:59 +0000
@@ -17,6 +17,7 @@
 
 def test_suite():
     module_names = ['tests.test_abrekcmd',
+                    'tests.test_abrektest',
                     'tests.test_abrektestinstaller',
                     'tests.test_abrektestparser',
                     'tests.test_abrektestrunner',

=== added file 'tests/test_abrektest.py'
--- tests/test_abrektest.py	1970-01-01 00:00:00 +0000
+++ tests/test_abrektest.py	2010-10-15 15:12:59 +0000
@@ -0,0 +1,48 @@
+# Copyright (c) 2010 Linaro
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+
+from abrek.testdef import AbrekTest, AbrekTestInstaller, AbrekTestRunner
+from imposters import OutputImposter, ConfigImposter
+from fixtures import TestCaseWithFixtures
+
+def maketest(name="foo", version="", installer=None, runner=None, parser=None):
+    if installer is None:
+        installer = makeinstaller()
+    return AbrekTest(name, version, installer, runner, parser)
+
+def makerunner(**kwargs):
+    return AbrekTestRunner(**kwargs)
+
+def makeinstaller(**kwargs):
+    return AbrekTestInstaller(**kwargs)
+
+class AbrekTestConfigOutput(TestCaseWithFixtures):
+    def setUp(self):
+        super(AbrekTestConfigOutput, self).setUp()
+        self.config = self.add_fixture(ConfigImposter())
+        self.out = self.add_fixture(OutputImposter())
+
+    def test_run(self):
+        testrunner = makerunner(steps=["echo foo"])
+        test = maketest(name="foo", runner=testrunner)
+        test.install()
+        test.run()
+        self.assertEqual("foo", self.out.getvalue().splitlines()[0])
+        completion_message = self.out.getvalue().splitlines()[1]
+        completion_pattern = "ABREK TEST RUN COMPLETE: Result id is 'foo\d+\.0'"
+        self.assertTrue(re.match(completion_pattern, completion_message))
+