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
16
except ImportError:
16
except ImportError:
6
17
    pass
17
    pass
7
18
18
8
19
from pprint import pformat
9
20
import sys
19
import sys
10
21
20
11
22
import gtk
21
import gtk
12
23
import pango
22
import pango
13
24
23
18
25
from testtools import (
24
try:
19
26
    MultiTestResult,
25
    import testrepository.repository.file
20
27
    TestResult,
26
except ImportError:
21
28
    )
27
    testrepository = None
22
28
23
29
from subunit import TestProtocolServer
29
from subunit import TestProtocolServer
24
30
from subunit.test_results import TestResultFilter
30
from subunit.test_results import TestResultFilter
25
31
31
26
@@ -35,7 +35,6 @@
27
35
from tribunal.eventloop import GtkLoop
35
from tribunal.eventloop import GtkLoop
28
36
from tribunal.view import (
36
from tribunal.view import (
29
37
    load_glade,
37
    load_glade,
30
38
    TribunalWindow,
31
39
    )
38
    )
32
40
39
33
41
40
34
@@ -257,7 +256,22 @@
35
257
        glade_xml.signal_autoconnect(self)
256
        glade_xml.signal_autoconnect(self)
36
258
257
37
259
        self._window.show_all()
258
        self._window.show_all()
39
260
        self._window.load_from_subunit_stream(file(argv[1], 'rt'))
259
        if len(argv) < 2:
40
260
            stream = None
41
261
            # Try for testrepository source
42
262
            if testrepository is not None:
43
263
                factory = testrepository.repository.file.RepositoryFactory()
44
264
                try:
45
265
                    repo = factory.open('.')
46
266
                except IOError:
47
267
                    stream = None
48
268
                else:
49
269
                    stream = repo.get_test_run(repo.latest_id()).get_subunit_stream()
50
270
            if stream is None:
51
271
                stream = sys.stdin
52
272
        else:
53
273
            stream = file(argv[1], 'rb')
54
274
        self._window.load_from_subunit_stream(stream)
55
261
275
56
262
        self._event_loop.start()
276
        self._event_loop.start()
57
263
277
Status:	Merged
Approved by:	Martin Pool on 2010-01-25
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
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Martin Pool		Approve on 2010-01-25
Jonathan Lange	2010-01-25	Pending
Review via email: mp+18006@code.launchpad.net