/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_revisionview.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-07 11:48:03 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20090507114803-sxykmkuzrkdj2pr3
Fix bug #373157 by properly setting the default values.

* tests/test_annotate_config.py:
(TestConfig.test_create_initial_config): Urgh, remove pdb breakpoint.

* annotate/config.py:
(gannotate_configspec): Deleted, can't be used for default values
and not used for validation: useless.
(gannotate_config_filename): Turned into a function so that tests
get proper isolated result (evaluating the path at load time
forbids the test framework overriding).
(GAnnotateConfig.__init__): Add default values *only* if the
'window' section doesn't exist. Assigning them unconditionally
defeats the config file purpose... Also delete the 'spans' section
since nobody use it.
(GAnnotateConfig.apply): Coerce config values when we use them.
(Gannotateconfig._save_custom_spans): Deleted (dead code).

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_revisionview.py
18
18
 
19
19
import os
20
20
 
 
21
import gtk
 
22
 
21
23
from bzrlib import (
22
24
    tests,
 
25
    revision,
23
26
    )
24
 
from bzrlib import bencode
 
27
from bzrlib.util import bencode
25
28
 
26
29
from bzrlib.plugins.gtk import revisionview
27
30
 
28
31
 
29
 
def fake_icon_path(*args):
30
 
    return os.path.join(
31
 
        os.path.dirname(__file__),  '..', 'icons', *args)
32
 
 
33
 
 
34
32
class TestPendingRevisions(tests.TestCaseWithMemoryTransport):
35
33
 
36
 
    def setUp(self):
37
 
        super(TestPendingRevisions, self).setUp()
38
 
        self.overrideAttr(revisionview, 'icon_path', new=fake_icon_path)
39
 
 
40
34
    def assertBufferText(self, text, buffer):
41
35
        """Check the text stored in the buffer."""
42
36
        self.assertEqual(text, buffer.get_text(buffer.get_start_iter(),
43
 
                                               buffer.get_end_iter(),
44
 
                                               True))
 
37
                                               buffer.get_end_iter()))
45
38
 
46
39
    def test_create_view(self):
47
40
        builder = self.make_branch_builder('test')
50
43
        b = builder.get_branch()
51
44
 
52
45
        rv = revisionview.RevisionView(b)
53
 
        self.addCleanup(rv.destroy)
54
46
        rev = b.repository.get_revision('A')
55
47
        rv.set_revision(rev)
56
48
        self.assertEqual(rev.committer, rv.committer.get_text())
71
63
        b = tree.branch
72
64
 
73
65
        rv = revisionview.RevisionView(b)
74
 
        self.addCleanup(rv.destroy)
75
66
        rev = b.repository.get_revision('A')
76
67
        rv.set_revision(rev)
77
68
 
92
83
        b = tree.branch
93
84
 
94
85
        rv = revisionview.RevisionView(b)
95
 
        self.addCleanup(rv.destroy)
96
86
        rev = b.repository.get_revision('A')
97
87
        rv.set_revision(rev)
98
88
 
99
89
        self.assertEqual(rev.committer, rv.committer.get_text())
100
90
        self.assertFalse(rv.file_info_box.get_property('visible'))
101
 
        log = self.get_log()
 
91
        log = self._get_log(True)
102
92
        self.assertContainsRe(log, 'Invalid per-file info for revision:A')