← 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: Martin Pool
  • Date: 2006-11-02 10:20:19 UTC
  • mfrom: (2114 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2119.
  • Revision ID: mbp@sourcefrog.net-20061102102019-9a5a02f485dff6f6
merge bzr.dev and reconcile several changes, also some test fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
35
35
        # If forced, it should succeed, but this is not tested here.
36
36
        self.run_bzr("init")
37
37
        self.build_tree(['hello.txt'])
38
 
        result = self.run_bzr("commit", "-m", "empty", retcode=3)
39
 
        self.assertEqual(('', 'bzr: ERROR: no changes to commit.'
40
 
                              ' use --unchanged to commit anyhow\n'),
41
 
                         result)
 
38
        out,err = self.run_bzr("commit", "-m", "empty", retcode=3)
 
39
        self.assertEqual('', out)
 
40
        self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
 
41
                                  ' use --unchanged to commit anyhow\n')
 
42
 
 
43
    def test_save_commit_message(self):
 
44
        """Failed commit should save the message in a file"""
 
45
        self.run_bzr("init")
 
46
        out,err = self.run_bzr("commit", "-m", "message", retcode=3)
 
47
        self.assertEqual('', out)
 
48
        self.assertStartsWith(err, 'bzr: ERROR: no changes to commit.'
 
49
                                  ' use --unchanged to commit anyhow\n'
 
50
                                  'Commit message saved. To reuse the message,'
 
51
                                  ' do\nbzr commit --file ')
 
52
        message_file = re.compile('bzr-commit-\S*').search(err).group()
 
53
        self.check_file_contents(message_file, 'message')
 
54
 
 
55
    def test_commit_success(self):
 
56
        """Successful commit should not leave behind a bzr-commit-* file"""
 
57
        self.run_bzr("init")
 
58
        self.run_bzr("commit", "--unchanged", "-m", "message")
 
59
        self.assertEqual('', self.capture('unknowns'))
 
60
 
 
61
        # same for unicode messages
 
62
        self.run_bzr("commit", "--unchanged", "-m", u'foo\xb5')
 
63
        self.assertEqual('', self.capture('unknowns'))
42
64
 
43
65
    def test_commit_with_path(self):
44
66
        """Commit tree with path of root specified"""