/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: Curtis Hovey
  • Date: 2012-02-03 19:49:55 UTC
  • mto: This revision was merged to the branch mainline in revision 773.
  • Revision ID: sinzui.is@verizon.net-20120203194955-69jvr0mgu8igea0i
Updated bzr-notify to gtk3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
17
17
"""Test the Commit functionality."""
18
18
 
19
19
import os
20
 
import subprocess
21
 
from tempfile import NamedTemporaryFile
22
20
 
23
21
from gi.repository import Gtk
24
22
 
51
49
        tree.commit('one')
52
50
 
53
51
        self.addCleanup(tree.lock_read().unlock)
54
 
        self.assertEquals([], list(commit.pending_revisions(tree)))
 
52
        self.assertIs(None, commit.pending_revisions(tree))
55
53
 
56
54
    def test_pending_revisions_simple(self):
57
55
        tree = self.make_branch_and_tree('tree')
62
60
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
63
61
 
64
62
        self.addCleanup(tree.lock_read().unlock)
65
 
        pending_revisions = list(commit.pending_revisions(tree))
 
63
        pending_revisions = commit.pending_revisions(tree)
66
64
        # One primary merge
67
65
        self.assertEqual(1, len(pending_revisions))
68
66
        # Revision == rev_id2
81
79
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
82
80
 
83
81
        self.addCleanup(tree.lock_read().unlock)
84
 
        pending_revisions = list(commit.pending_revisions(tree))
 
82
        pending_revisions = commit.pending_revisions(tree)
85
83
        # One primary merge
86
84
        self.assertEqual(1, len(pending_revisions))
87
85
        # Revision == rev_id2
105
103
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
106
104
 
107
105
        self.addCleanup(tree.lock_read().unlock)
108
 
        pending_revisions = list(commit.pending_revisions(tree))
 
106
        pending_revisions = commit.pending_revisions(tree)
109
107
        # Two primary merges
110
108
        self.assertEqual(2, len(pending_revisions))
111
109
        # Revision == rev_id2
174
172
 
175
173
        dlg = CommitDialogNoWidgets(tree)
176
174
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
177
 
        self.assertEquals([], dlg._pending)
 
175
        self.assertIs(None, dlg._pending)
178
176
        self.assertFalse(dlg._is_checkout)
179
177
 
180
178
    def test_setup_parameters_checkout(self):
185
183
 
186
184
        dlg = CommitDialogNoWidgets(tree2)
187
185
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
188
 
        self.assertEquals([], dlg._pending)
 
186
        self.assertIs(None, dlg._pending)
189
187
        self.assertTrue(dlg._is_checkout)
190
188
 
191
189
    def test_setup_parameters_pending(self):
235
233
        dlg._on_treeview_files_cursor_changed(treeview)
236
234
        self.assertFalse(CommitDialogNoWidgets._update_per_file_info.called)
237
235
 
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
 
 
245
236
 
246
237
class TestCommitDialog(tests.TestCaseWithTransport):
247
238
 
1305
1296
        self.assertEquals(u'', self._get_commit_message())
1306
1297
        self.assertEquals(u'de',
1307
1298
                          self._get_file_commit_messages())
1308
 
 
1309
 
 
1310
 
class BzrHandlePatchTestCase(tests.TestCase):
1311
 
 
1312
 
    def setUp(self):
1313
 
        top = os.path.abspath(os.path.join(
1314
 
            os.path.dirname(__file__), os.pardir))
1315
 
        self.script = os.path.join(top, 'bzr-handle-patch')
1316
 
        self.env = dict(os.environ)
1317
 
        self.env['BZR_PLUGINS_AT'] = 'gtk@%s' % top
1318
 
        self.patch = NamedTemporaryFile()
1319
 
        self.patch.write('\n'.join([
1320
 
            "=== added file '_test.txt'",
1321
 
            "--- _test.txt      1970-01-01 00:00:00 +0000",
1322
 
            "+++ _test.txt      2012-02-03 20:00:34 +0000",
1323
 
            "@@ -0,0 +1,1 @@",
1324
 
            "+hello",
1325
 
            ]))
1326
 
        self.patch.flush()
1327
 
        super(BzrHandlePatchTestCase, self).setUp()
1328
 
 
1329
 
    def test_smoketest(self):
1330
 
        # This is a smoke test to verify the process starts.
1331
 
        bzr_notify = subprocess.Popen(
1332
 
            [self.script, self.patch.name, 'test'],
1333
 
            stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=self.env)
1334
 
        stdout, stderr = bzr_notify.communicate()
1335
 
        self.assertEqual('', stdout)
1336
 
        self.assertEqual('', stderr)