/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: 2011-08-12 20:25:28 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110812202528-4xf4a2t23urx50d2
Updated gst to gtk3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
18
18
 
19
19
import os
20
20
 
21
 
import gtk
 
21
from gi.repository import Gtk
22
22
 
23
23
from bzrlib import (
24
24
    branch,
25
 
    revision,
26
25
    tests,
27
26
    uncommit,
28
27
    )
414
413
        dlg = commit.CommitDialog(tree)
415
414
        diff_buffer = dlg._diff_view.buffer
416
415
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
417
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
416
                                    diff_buffer.get_end_iter(),
 
417
                                    True).splitlines(True)
418
418
 
419
419
        self.assertEqual("=== modified file 'a'\n", text[0])
420
420
        self.assertContainsRe(text[1],
468
468
        dlg._treeview_files.set_cursor((1,))
469
469
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
470
470
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
471
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
471
                                    diff_buffer.get_end_iter(),
 
472
                                    True).splitlines(True)
472
473
        self.assertEqual("=== added file 'a'\n", text[0])
473
474
        self.assertContainsRe(text[1],
474
475
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
485
486
        dlg._treeview_files.set_cursor((2,))
486
487
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
487
488
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
488
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
489
                                    diff_buffer.get_end_iter(),
 
490
                                    True).splitlines(True)
489
491
        self.assertEqual("=== added file 'b'\n", text[0])
490
492
        self.assertContainsRe(text[1],
491
493
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
515
517
 
516
518
        def get_file_text():
517
519
            buf = dlg._file_message_text_view.get_buffer()
518
 
            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
 
520
            return buf.get_text(
 
521
                buf.get_start_iter(), buf.get_end_iter(), True)
519
522
 
520
523
        def get_saved_text(path):
521
524
            """Get the saved text for a given record."""
680
683
        def _question_yes(*args, **kwargs):
681
684
            self.questions.append(args)
682
685
            self.questions.append('YES')
683
 
            return gtk.RESPONSE_YES
 
686
            return Gtk.ResponseType.YES
684
687
        dlg._question_dialog = _question_yes
685
688
 
686
689
    def _set_question_no(self, dlg):
689
692
        def _question_no(*args, **kwargs):
690
693
            self.questions.append(args)
691
694
            self.questions.append('NO')
692
 
            return gtk.RESPONSE_NO
 
695
            return Gtk.ResponseType.NO
693
696
        dlg._question_dialog = _question_no
694
697
 
695
698