/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 brzlib/tests/blackbox/test_push.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 15:41:52 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521154152-u4qrysj89fyczrxz
Some more test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/blackbox/test_push.py
399
399
        self.assertPathExists('target/a')
400
400
 
401
401
    def test_push_use_existing_into_empty_bzrdir(self):
402
 
        """'brz push --use-existing-dir' into a dir with an empty .brz dir
 
402
        """'brz push --use-existing-dir' into a dir with an empty .bzr dir
403
403
        fails.
404
404
        """
405
405
        tree = self.create_simple_tree()
406
406
        self.build_tree(['target/', 'target/.bzr/'])
407
407
        self.run_bzr_error(
408
 
            ['Target directory ../target already contains a .brz directory, '
 
408
            ['Target directory ../target already contains a .bzr directory, '
409
409
             'but it is not valid.'],
410
410
            'push ../target --use-existing-dir', working_dir='tree')
411
411