/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_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2012-03-29 13:15:14 UTC
  • mfrom: (786.1.1 register-lazy)
  • Revision ID: jelmer@samba.org-20120329131514-knrl1w2wzntx89rv
Use lazy registration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
51
51
        tree.commit('one')
52
52
 
53
53
        self.addCleanup(tree.lock_read().unlock)
54
 
        self.assertIs(None, commit.pending_revisions(tree))
 
54
        self.assertEquals([], list(commit.pending_revisions(tree)))
55
55
 
56
56
    def test_pending_revisions_simple(self):
57
57
        tree = self.make_branch_and_tree('tree')
62
62
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
63
63
 
64
64
        self.addCleanup(tree.lock_read().unlock)
65
 
        pending_revisions = commit.pending_revisions(tree)
 
65
        pending_revisions = list(commit.pending_revisions(tree))
66
66
        # One primary merge
67
67
        self.assertEqual(1, len(pending_revisions))
68
68
        # Revision == rev_id2
81
81
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
82
82
 
83
83
        self.addCleanup(tree.lock_read().unlock)
84
 
        pending_revisions = commit.pending_revisions(tree)
 
84
        pending_revisions = list(commit.pending_revisions(tree))
85
85
        # One primary merge
86
86
        self.assertEqual(1, len(pending_revisions))
87
87
        # Revision == rev_id2
105
105
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
106
106
 
107
107
        self.addCleanup(tree.lock_read().unlock)
108
 
        pending_revisions = commit.pending_revisions(tree)
 
108
        pending_revisions = list(commit.pending_revisions(tree))
109
109
        # Two primary merges
110
110
        self.assertEqual(2, len(pending_revisions))
111
111
        # Revision == rev_id2
174
174
 
175
175
        dlg = CommitDialogNoWidgets(tree)
176
176
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
177
 
        self.assertIs(None, dlg._pending)
 
177
        self.assertEquals([], dlg._pending)
178
178
        self.assertFalse(dlg._is_checkout)
179
179
 
180
180
    def test_setup_parameters_checkout(self):
185
185
 
186
186
        dlg = CommitDialogNoWidgets(tree2)
187
187
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
188
 
        self.assertIs(None, dlg._pending)
 
188
        self.assertEquals([], dlg._pending)
189
189
        self.assertTrue(dlg._is_checkout)
190
190
 
191
191
    def test_setup_parameters_pending(self):
235
235
        dlg._on_treeview_files_cursor_changed(treeview)
236
236
        self.assertFalse(CommitDialogNoWidgets._update_per_file_info.called)
237
237
 
 
238
    def test_get_line_height(self):
 
239
        tree = self.make_branch_and_tree('tree')
 
240
        dlg = CommitDialogNoWidgets(tree)
 
241
        textview = Gtk.TextView()
 
242
        line_height = dlg.get_line_height(textview)
 
243
        self.assertIsInstance(line_height, int)
 
244
 
238
245
 
239
246
class TestCommitDialog(tests.TestCaseWithTransport):
240
247
 
1307
1314
            os.path.dirname(__file__), os.pardir))
1308
1315
        self.script = os.path.join(top, 'bzr-handle-patch')
1309
1316
        self.env = dict(os.environ)
1310
 
        self.env['BZR_PLUGINS_AT'] = 'gtk@%s' %top
 
1317
        self.env['BZR_PLUGINS_AT'] = 'gtk@%s' % top
1311
1318
        self.patch = NamedTemporaryFile()
1312
1319
        self.patch.write('\n'.join([
1313
1320
            "=== added file '_test.txt'",