Merge lp:~jelmer/tribunal/view-subunit into lp:~mbp/tribunal/view-subunit-broken

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

This merges Roberts changes (and resolves the conflicts) and fixes a few unused imports.

[Martin Pool (mbp)]

review: Approve

=== modified file 'bin/tribunal-subunit'
--- bin/tribunal-subunit	2010-01-25 15:31:21 +0000
+++ bin/tribunal-subunit	2010-01-25 15:43:14 +0000
@@ -16,16 +16,16 @@
 except ImportError:
     pass
 
-from pprint import pformat
 import sys
 
 import gtk
 import pango
 
-from testtools import (
-    MultiTestResult,
-    TestResult,
-    )
+try:
+    import testrepository.repository.file
+except ImportError:
+    testrepository = None
+
 from subunit import TestProtocolServer
 from subunit.test_results import TestResultFilter
 
@@ -35,7 +35,6 @@
 from tribunal.eventloop import GtkLoop
 from tribunal.view import (
     load_glade,
-    TribunalWindow,
     )
 
 
@@ -257,7 +256,22 @@
         glade_xml.signal_autoconnect(self)
 
         self._window.show_all()
-        self._window.load_from_subunit_stream(file(argv[1], 'rt'))
+        if len(argv) < 2:
+            stream = None
+            # Try for testrepository source
+            if testrepository is not None:
+                factory = testrepository.repository.file.RepositoryFactory()
+                try:
+                    repo = factory.open('.')
+                except IOError:
+                    stream = None
+                else:
+                    stream = repo.get_test_run(repo.latest_id()).get_subunit_stream()
+            if stream is None:
+                stream = sys.stdin
+        else:
+            stream = file(argv[1], 'rb')
+        self._window.load_from_subunit_stream(stream)
 
         self._event_loop.start()