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

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Martin Pool
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~jelmer/tribunal/view-subunit
Merge into: lp:~mbp/tribunal/view-subunit-broken
Diff against target: 56 lines (+21/-7)
1 file modified
bin/tribunal-subunit (+21/-7)
To merge this branch: bzr merge lp:~jelmer/tribunal/view-subunit
Reviewer Review Type Date Requested Status
Martin Pool Approve
Jonathan Lange Pending
Review via email: mp+18006@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

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

Revision history for this message
Martin Pool (mbp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/tribunal-subunit'
2--- bin/tribunal-subunit 2010-01-25 15:31:21 +0000
3+++ bin/tribunal-subunit 2010-01-25 15:43:14 +0000
4@@ -16,16 +16,16 @@
5 except ImportError:
6 pass
7
8-from pprint import pformat
9 import sys
10
11 import gtk
12 import pango
13
14-from testtools import (
15- MultiTestResult,
16- TestResult,
17- )
18+try:
19+ import testrepository.repository.file
20+except ImportError:
21+ testrepository = None
22+
23 from subunit import TestProtocolServer
24 from subunit.test_results import TestResultFilter
25
26@@ -35,7 +35,6 @@
27 from tribunal.eventloop import GtkLoop
28 from tribunal.view import (
29 load_glade,
30- TribunalWindow,
31 )
32
33
34@@ -257,7 +256,22 @@
35 glade_xml.signal_autoconnect(self)
36
37 self._window.show_all()
38- self._window.load_from_subunit_stream(file(argv[1], 'rt'))
39+ if len(argv) < 2:
40+ stream = None
41+ # Try for testrepository source
42+ if testrepository is not None:
43+ factory = testrepository.repository.file.RepositoryFactory()
44+ try:
45+ repo = factory.open('.')
46+ except IOError:
47+ stream = None
48+ else:
49+ stream = repo.get_test_run(repo.latest_id()).get_subunit_stream()
50+ if stream is None:
51+ stream = sys.stdin
52+ else:
53+ stream = file(argv[1], 'rb')
54+ self._window.load_from_subunit_stream(stream)
55
56 self._event_loop.start()
57

Subscribers

People subscribed via source and target branches

to all changes: