← 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: Matt Nordhoff
  • Date: 2009-06-23 05:12:07 UTC
  • mto: This revision was merged to the branch mainline in revision 4474.
  • Revision ID: mnordhoff@mattnordhoff.com-20090623051207-fksdtbzkwtnrw9dd
Update _add_text docstrings that still referred to add_text.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 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
255
255
        if char is None:
256
256
            raise TestSkipped('Cannot find suitable non-ascii character'
257
257
                'for user_encoding (%s)' % osutils.get_user_encoding())
258
 
        # TODO: jam 2009-07-23 This test seems to fail on Windows now. My best
259
 
        #       guess is that the change to use Unicode command lines means
260
 
        #       that we no longer pay any attention to LANG=C when decoding the
261
 
        #       commandline arguments.
262
258
        out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
263
259
                                          retcode=1,
264
260
                                          env_changes={'LANG': 'C'})
273
269
        self.build_tree_contents([
274
270
            ('branch/foo.c', 'int main() {}'),
275
271
            ('branch/bar.c', 'int main() {}')])
276
 
        inner_tree.add(['foo.c', 'bar.c'])
 
272
        inner_tree.add('foo.c')
 
273
        inner_tree.add('bar.c')
277
274
        # can't commit files in different trees; sane error
278
275
        self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
279
 
        # can commit to branch - records foo.c only
280
276
        self.run_bzr('commit -m newstuff branch/foo.c')
281
 
        # can commit to branch - records bar.c
282
277
        self.run_bzr('commit -m newstuff branch')
283
 
        # No changes left
284
 
        self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
 
278
        self.run_bzr('commit -m newstuff branch', retcode=3)
285
279
 
286
280
    def test_out_of_date_tree_commit(self):
287
281
        # check we get an error code and a clear message committing with an out