← 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: 2010-01-12 01:44:13 UTC
  • mto: (4634.119.3 2.0)
  • mto: This revision was merged to the branch mainline in revision 4951.
  • Revision ID: mbp@sourcefrog.net-20100112014413-uw90vrssc3trlzmt
https://launchpad.net/bugs/449372
Refuse to build with pyrex 0.9.4*

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
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.
258
262
        out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
259
263
                                          retcode=1,
260
264
                                          env_changes={'LANG': 'C'})
269
273
        self.build_tree_contents([
270
274
            ('branch/foo.c', 'int main() {}'),
271
275
            ('branch/bar.c', 'int main() {}')])
272
 
        inner_tree.add('foo.c')
273
 
        inner_tree.add('bar.c')
 
276
        inner_tree.add(['foo.c', 'bar.c'])
274
277
        # can't commit files in different trees; sane error
275
278
        self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
 
279
        # can commit to branch - records foo.c only
276
280
        self.run_bzr('commit -m newstuff branch/foo.c')
 
281
        # can commit to branch - records bar.c
277
282
        self.run_bzr('commit -m newstuff branch')
278
 
        self.run_bzr('commit -m newstuff branch', retcode=3)
 
283
        # No changes left
 
284
        self.run_bzr_error(["No changes to commit"], 'commit -m newstuff branch')
279
285
 
280
286
    def test_out_of_date_tree_commit(self):
281
287
        # check we get an error code and a clear message committing with an out