← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-10-08 04:25:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5472.
  • Revision ID: andrew.bennetts@canonical.com-20101008042510-sg9vdhmnggilzxsk
Fix stray TAB in source.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
 
18
18
"""Tests for the commit CLI of bzr."""
19
19
 
20
 
import doctest
21
20
import os
22
21
import re
23
22
import sys
24
23
 
25
 
from testtools.matchers import DocTestMatches
26
 
 
27
24
from bzrlib import (
28
 
    config,
 
25
    bzrdir,
29
26
    osutils,
30
27
    ignores,
31
28
    msgeditor,
 
29
    osutils,
32
30
    tests,
33
31
    )
34
32
from bzrlib.bzrdir import BzrDir
35
33
from bzrlib.tests import (
36
34
    probe_bad_non_ascii,
37
 
    test_foreign,
38
35
    TestSkipped,
39
36
    UnicodeFilenameFeature,
40
37
    )
50
47
        self.build_tree(['hello.txt'])
51
48
        out,err = self.run_bzr('commit -m empty', retcode=3)
52
49
        self.assertEqual('', out)
53
 
        # Two ugly bits here.
54
 
        # 1) We really don't want 'aborting commit write group' anymore.
55
 
        # 2) bzr: ERROR: is a really long line, so we wrap it with '\'
56
 
        self.assertThat(
57
 
            err,
58
 
            DocTestMatches("""\
59
 
Committing to: ...
60
 
aborting commit write group: PointlessCommit(No changes to commit)
61
 
bzr: ERROR: No changes to commit.\
62
 
 Please 'bzr add' the files you want to commit,\
63
 
 or use --unchanged to force an empty commit.
64
 
""", flags=doctest.ELLIPSIS|doctest.REPORT_UDIFF))
 
50
        self.assertContainsRe(err, 'bzr: ERROR: No changes to commit\.'
 
51
                                  ' Use --unchanged to commit anyhow.\n')
65
52
 
66
53
    def test_commit_success(self):
67
54
        """Successful commit should not leave behind a bzr-commit-* file"""
73
60
        self.run_bzr(["commit", "--unchanged", "-m", u'foo\xb5'])
74
61
        self.assertEqual('', self.run_bzr('unknowns')[0])
75
62
 
76
 
    def test_commit_lossy_native(self):
77
 
        """A --lossy option to commit is supported."""
78
 
        self.make_branch_and_tree('.')
79
 
        self.run_bzr('commit --lossy --unchanged -m message')
80
 
        self.assertEqual('', self.run_bzr('unknowns')[0])
81
 
 
82
 
    def test_commit_lossy_foreign(self):
83
 
        test_foreign.register_dummy_foreign_for_test(self)
84
 
        self.make_branch_and_tree('.',
85
 
            format=test_foreign.DummyForeignVcsDirFormat())
86
 
        self.run_bzr('commit --lossy --unchanged -m message')
87
 
        output = self.run_bzr('revision-info')[0]
88
 
        self.assertTrue(output.startswith('1 dummy-'))
89
 
 
90
63
    def test_commit_with_path(self):
91
64
        """Commit tree with path of root specified"""
92
65
        a_tree = self.make_branch_and_tree('a')
106
79
        self.run_bzr('resolved b/a_file')
107
80
        self.run_bzr(['commit', '-m', 'merge into b', 'b'])
108
81
 
 
82
 
109
83
    def test_10_verbose_commit(self):
110
84
        """Add one file and examine verbose commit output"""
111
85
        tree = self.make_branch_and_tree('.')
335
309
        tree.add('foo.c')
336
310
        self.run_bzr('commit -m ""', retcode=3)
337
311
 
 
312
    def test_unsupported_encoding_commit_message(self):
 
313
        if sys.platform == 'win32':
 
314
            raise tests.TestNotApplicable('Win32 parses arguments directly'
 
315
                ' as Unicode, so we can\'t pass invalid non-ascii')
 
316
        tree = self.make_branch_and_tree('.')
 
317
        self.build_tree_contents([('foo.c', 'int main() {}')])
 
318
        tree.add('foo.c')
 
319
        # LANG env variable has no effect on Windows
 
320
        # but some characters anyway cannot be represented
 
321
        # in default user encoding
 
322
        char = probe_bad_non_ascii(osutils.get_user_encoding())
 
323
        if char is None:
 
324
            raise TestSkipped('Cannot find suitable non-ascii character'
 
325
                'for user_encoding (%s)' % osutils.get_user_encoding())
 
326
        out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
 
327
                                          retcode=1,
 
328
                                          env_changes={'LANG': 'C'})
 
329
        self.assertContainsRe(err, r'bzrlib.errors.BzrError: Parameter.*is '
 
330
                                    'unsupported by the current encoding.')
 
331
 
338
332
    def test_other_branch_commit(self):
339
333
        # this branch is to ensure consistent behaviour, whether we're run
340
334
        # inside a branch, or not.
725
719
            f = file('fed.bat', 'w')
726
720
            f.write('@rem dummy fed')
727
721
            f.close()
728
 
            self.overrideEnv('BZR_EDITOR', "fed.bat")
 
722
            osutils.set_or_unset_env('BZR_EDITOR', "fed.bat")
729
723
        else:
730
724
            f = file('fed.sh', 'wb')
731
725
            f.write('#!/bin/sh\n')
732
726
            f.close()
733
727
            os.chmod('fed.sh', 0755)
734
 
            self.overrideEnv('BZR_EDITOR', "./fed.sh")
 
728
            osutils.set_or_unset_env('BZR_EDITOR', "./fed.sh")
735
729
 
736
730
    def setup_commit_with_template(self):
737
731
        self.setup_editor()
762
756
        os.chdir('foo')
763
757
        open('foo.txt', 'w').write('hello')
764
758
        self.run_bzr(['add'])
765
 
        self.overrideEnv('EMAIL', None)
766
 
        self.overrideEnv('BZR_EMAIL', None)
767
 
        # Also, make sure that it's not inferred from mailname.
768
 
        self.overrideAttr(config, '_auto_user_id',
769
 
            lambda: (None, None))
 
759
        osutils.set_or_unset_env('EMAIL', None)
 
760
        osutils.set_or_unset_env('BZR_EMAIL', None)
770
761
        out, err = self.run_bzr(['commit', '-m', 'initial'], 3)
771
762
        self.assertContainsRe(err, 'Unable to determine your name')
772
763