/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-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

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
20
22
 
21
23
from gi.repository import Gtk
22
24
 
49
51
        tree.commit('one')
50
52
 
51
53
        self.addCleanup(tree.lock_read().unlock)
52
 
        self.assertIs(None, commit.pending_revisions(tree))
 
54
        self.assertEquals([], list(commit.pending_revisions(tree)))
53
55
 
54
56
    def test_pending_revisions_simple(self):
55
57
        tree = self.make_branch_and_tree('tree')
60
62
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
61
63
 
62
64
        self.addCleanup(tree.lock_read().unlock)
63
 
        pending_revisions = commit.pending_revisions(tree)
 
65
        pending_revisions = list(commit.pending_revisions(tree))
64
66
        # One primary merge
65
67
        self.assertEqual(1, len(pending_revisions))
66
68
        # Revision == rev_id2
79
81
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
80
82
 
81
83
        self.addCleanup(tree.lock_read().unlock)
82
 
        pending_revisions = commit.pending_revisions(tree)
 
84
        pending_revisions = list(commit.pending_revisions(tree))
83
85
        # One primary merge
84
86
        self.assertEqual(1, len(pending_revisions))
85
87
        # Revision == rev_id2
103
105
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
104
106
 
105
107
        self.addCleanup(tree.lock_read().unlock)
106
 
        pending_revisions = commit.pending_revisions(tree)
 
108
        pending_revisions = list(commit.pending_revisions(tree))
107
109
        # Two primary merges
108
110
        self.assertEqual(2, len(pending_revisions))
109
111
        # Revision == rev_id2
172
174
 
173
175
        dlg = CommitDialogNoWidgets(tree)
174
176
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
175
 
        self.assertIs(None, dlg._pending)
 
177
        self.assertEquals([], dlg._pending)
176
178
        self.assertFalse(dlg._is_checkout)
177
179
 
178
180
    def test_setup_parameters_checkout(self):
183
185
 
184
186
        dlg = CommitDialogNoWidgets(tree2)
185
187
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
186
 
        self.assertIs(None, dlg._pending)
 
188
        self.assertEquals([], dlg._pending)
187
189
        self.assertTrue(dlg._is_checkout)
188
190
 
189
191
    def test_setup_parameters_pending(self):
233
235
        dlg._on_treeview_files_cursor_changed(treeview)
234
236
        self.assertFalse(CommitDialogNoWidgets._update_per_file_info.called)
235
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
 
236
245
 
237
246
class TestCommitDialog(tests.TestCaseWithTransport):
238
247
 
1296
1305
        self.assertEquals(u'', self._get_commit_message())
1297
1306
        self.assertEquals(u'de',
1298
1307
                          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)