/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_commit.py

  • Committer: Martin Pool
  • Date: 2009-12-09 05:47:32 UTC
  • mfrom: (4879 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4880.
  • Revision ID: mbp@sourcefrog.net-20091209054732-7414e9uma23mfv6x
trivial merge of trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
25
25
    ignores,
26
26
    msgeditor,
27
27
    osutils,
 
28
    tests,
28
29
    )
29
30
from bzrlib.bzrdir import BzrDir
30
31
from bzrlib.tests import (
106
107
                              'modified hello\.txt\n'
107
108
                              'Committed revision 2\.\n$')
108
109
 
 
110
    def test_warn_about_forgotten_commit_message(self):
 
111
        """Test that the lack of -m parameter is caught"""
 
112
        wt = self.make_branch_and_tree('.')
 
113
        self.build_tree(['one', 'two'])
 
114
        wt.add(['two'])
 
115
        out, err = self.run_bzr('commit -m one two')
 
116
        self.assertContainsRe(err, "The commit message is a file name")
 
117
 
109
118
    def test_verbose_commit_renamed(self):
110
119
        # Verbose commit of renamed file should say so
111
120
        wt = self.prepare_simple_history()
263
272
        self.run_bzr('commit -m ""', retcode=3)
264
273
 
265
274
    def test_unsupported_encoding_commit_message(self):
 
275
        if sys.platform == 'win32':
 
276
            raise tests.TestNotApplicable('Win32 parses arguments directly'
 
277
                ' as Unicode, so we can\'t pass invalid non-ascii')
266
278
        tree = self.make_branch_and_tree('.')
267
279
        self.build_tree_contents([('foo.c', 'int main() {}')])
268
280
        tree.add('foo.c')
273
285
        if char is None:
274
286
            raise TestSkipped('Cannot find suitable non-ascii character'
275
287
                'for user_encoding (%s)' % osutils.get_user_encoding())
276
 
        # TODO: jam 2009-07-23 This test seems to fail on Windows now. My best
277
 
        #       guess is that the change to use Unicode command lines means
278
 
        #       that we no longer pay any attention to LANG=C when decoding the
279
 
        #       commandline arguments.
280
288
        out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
281
289
                                          retcode=1,
282
290
                                          env_changes={'LANG': 'C'})
608
616
        properties = last_rev.properties
609
617
        self.assertEqual('John Doe\nJane Rey', properties['authors'])
610
618
 
 
619
    def test_commit_time(self):
 
620
        tree = self.make_branch_and_tree('tree')
 
621
        self.build_tree(['tree/hello.txt'])
 
622
        tree.add('hello.txt')
 
623
        out, err = self.run_bzr("commit -m hello "
 
624
            "--commit-time='2009-10-10 08:00:00 +0100' tree/hello.txt")
 
625
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
 
626
        self.assertEqual(
 
627
            'Sat 2009-10-10 08:00:00 +0100',
 
628
            osutils.format_date(last_rev.timestamp, last_rev.timezone))
 
629
        
 
630
    def test_commit_time_bad_time(self):
 
631
        tree = self.make_branch_and_tree('tree')
 
632
        self.build_tree(['tree/hello.txt'])
 
633
        tree.add('hello.txt')
 
634
        out, err = self.run_bzr("commit -m hello "
 
635
            "--commit-time='NOT A TIME' tree/hello.txt", retcode=3)
 
636
        self.assertStartsWith(
 
637
            err, "bzr: ERROR: Could not parse --commit-time:")
 
638
 
611
639
    def test_partial_commit_with_renames_in_tree(self):
612
640
        # this test illustrates bug #140419
613
641
        t = self.make_branch_and_tree('.')