Merge lp:~lifeless/tribunal/testrepository into lp:tribunal

[Robert Collins]

[Robert Collins (lifeless)]

This hooks up testr run to the reload button in tribunal-subunit.

So, if you have a .testr.conf for a project, and hit reload, it will run the projects tests. I've tested this by starting with a clean environment, breaking a test, hitting reload, waiting - et voila, the errors showed up. I then fixed them, hit reload, and they went away.

\o/ success.

[Martin Pool (mbp)]

Great feature, though the reload button does not seem like the right place for it.

What's trui?

review: Needs Fixing

[Martin Pool (mbp)]

(discussed offline)

I'll tweak and merge.

review: Approve

[lp:~lifeless/tribunal/testrepository]

121. By Martin Pool on 2010-03-13

Alternate success and failure in emit-tests

122. By Martin Pool on 2010-03-13

Update todos

[Martin Pool (mbp)]

this is now actually merged; I don't know why Launchpad doesn't think so

review: Approve

=== modified file 'bin/tribunal-subunit'
--- bin/tribunal-subunit	2010-02-19 08:16:29 +0000
+++ bin/tribunal-subunit	2010-02-28 22:05:24 +0000
@@ -37,6 +37,7 @@
 
 import errno
 import optparse
+import os.path
 import sys
 
 import gobject
@@ -80,8 +81,9 @@
         saying whether they should be shown
     """
     
-    def __init__(self, glade_xml):
+    def __init__(self, glade_xml, opts):
         self.glade = glade_xml
+        self.opts = opts # An OptParse options object.
         for i in [
             'result_frame',
             'result_frame_label',
@@ -260,6 +262,27 @@
         self.model_filter.refilter()
 
     def reload_stream(self):
+        if self.opts.testr:
+            # run the test suite again.
+            from testrepository.commands import run
+            from tribunal import trui
+            # Work around bug in testrepository (just filed, no # yet).
+            url = os.path.expanduser(self.opts.testr)
+            ui = trui.GTKUI(self, url)
+            cmd = run.run(ui)
+            # Work around 'testr run' loading to the wrong repo.
+            here = os.getcwd()
+            os.chdir(url)
+            try:
+                res = cmd.execute()
+            finally:
+                os.chdir(here)
+            # Ignoring detail of exit code: the subunit parsing + ui error
+            # methods will inform the user.
+            if res == 3:
+                # But if it went badly wrong, don't both doing work in the UI.
+                return
+            self._last_input_file = testrepository_last_stream(self.opts)
         try:
             self._last_input_file.seek(0)
         except IOError, e:
@@ -286,7 +309,7 @@
 
     def _construct_and_show_window(self):
         glade_xml = load_glade()
-        self._window = SubunitWindow(glade_xml)
+        self._window = SubunitWindow(glade_xml, self.opts)
         glade_xml.signal_autoconnect(self)
         self._set_default_icons()
         self._window.show_all()
@@ -307,13 +330,10 @@
         parser.add_option('--testr',
             help='read from a testrepository in the given directory')
 
-        opts, args = parser.parse_args(argv)
+        self.opts, args = parser.parse_args(argv)
 
-        if opts.testr:
-            import testrepository.repository.file
-            factory = testrepository.repository.file.RepositoryFactory()
-            repo = factory.open(opts.testr)
-            stream = repo.get_test_run(repo.latest_id()).get_subunit_stream()
+        if self.opts.testr:
+            stream = testrepository_last_stream(self.opts)
         elif args == ['-']:
             stream = sys.stdin
         elif len(args) == 1:
@@ -345,6 +365,15 @@
     return '\n'.join(bits)
 
 
+def testrepository_last_stream(opts):
+    import testrepository.repository.file
+    factory = testrepository.repository.file.RepositoryFactory()
+    # Work around bug in testrepository (just filed, no # yet).
+    url = os.path.expanduser(opts.testr)
+    repo = factory.open(url)
+    return repo.get_test_run(repo.latest_id()).get_subunit_stream()
+
+
 if __name__ == '__main__':
     app = ViewSubunitApp(GtkLoop())
     app.run(sys.argv[1:])

=== added file 'tribunal/trui.py'
--- tribunal/trui.py	1970-01-01 00:00:00 +0000
+++ tribunal/trui.py	2010-02-28 22:05:24 +0000
@@ -0,0 +1,107 @@
+#! /usr/bin/env python
+
+# Copyright (C) 2010 Robert Collins <[e-mail]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. 
+#
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0 
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License. 
+#
+# Part of Tribunal <https://launchpad.net/tribunal>
+
+"""Support for running testrepository commands."""
+
+__all__ = ['GTKUI']
+
+import optparse
+
+import gtk
+from testrepository import ui
+
+
+class GTKUI(ui.AbstractUI):
+    """A GTK testrepository.ui.AbstractUI implementation."""
+
+    def __init__(self, subunit_window, here):
+        """Create a GTKUI to run a TestRepository command under subunit_window.
+
+        :param subunit_window: A SubunitWindow from tribunal-subunit.
+        :param here: What should the 'here' be for the UI.
+        """
+        self.window = subunit_window
+        self.here = here
+
+    def _check_cmd(self):
+        # TODO: prompt for options and arguments here.
+        # Options are available on self.cmd.options
+        options = []
+        self.options = optparse.Values()
+        seen_options = set()
+        for option, value in options:
+            setattr(self.options, option, value)
+            seen_options.add(option)
+        if not 'quiet' in seen_options:
+            setattr(self.options, 'quiet', False)
+        for option in self.cmd.options:
+            if not option.dest in seen_options:
+                setattr(self.options, option.dest, option.default)
+        # Arguments on self.cmd.args
+        parsed_args = {}
+        unparsed = []
+        failed = False
+        for arg in self.cmd.args:
+            try:
+                parsed_args[arg.name] = arg.parse(unparsed)
+            except ValueError:
+                failed = True
+                break
+        self.arguments = parsed_args
+        return unparsed == [] and not failed
+
+    def output_error(self, error_tuple):
+        # Shows the error in a dialog. We could instead have a 'console' on 
+        # the SubunitWindow and write the error into the console.
+        import traceback
+        exctype, value, tb = error_tuple
+        as_string = ''.join(traceback.format_exception(exctype, value, tb))
+        dialog = gtk.MessageDialog(self.window.subunit_window,
+            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+            gtk.MESSAGE_ERROR,
+            gtk.BUTTONS_CLOSE,
+            as_string)
+        dialog.run()
+        dialog.destroy()
+
+    def output_rest(self, rest_string):
+        # TODO: format as HTML, embed a browser?
+        raise NotImplementedError(self.output_rest)
+
+    def output_results(self, suite_or_test):
+        # TODO: feed to the main window
+        raise NotImplementedError(self.output_results)
+
+    def output_stream(self, stream):
+        # TODO: ask for a filename to save to.
+        raise NotImplementedError(self.output_stream)
+
+    def output_table(self, table):
+        raise NotImplementedError(self.output_table)
+
+    def output_values(self, values):
+        # TODO: log this to the GUI somehow.
+        outputs = []
+        for label, value in values:
+            outputs.append('%s: %s' % (label, value))
+        print '%s\n' % ' '.join(outputs)
+
+    def subprocess_Popen(self, *args, **kwargs):
+        # TODO: use a GTK GIO thingy
+        import subprocess
+        return subprocess.Popen(*args, **kwargs)