← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_init.py
100
100
        # init an existing branch.
101
101
        out, err = self.run_bzr('init subdir2', retcode=3)
102
102
        self.assertEqual('', out)
103
 
        self.failUnless(err.startswith('bzr: ERROR: Already a branch:'))
 
103
        self.assertTrue(err.startswith('bzr: ERROR: Already a branch:'))
104
104
 
105
105
    def test_init_branch_quiet(self):
106
106
        out, err = self.run_bzr('init -q')
154
154
        self.run_bzr_error(['Parent directory of ../new/tree does not exist'],
155
155
                            'init ../new/tree', working_dir='tree')
156
156
        self.run_bzr('init ../new/tree --create-prefix', working_dir='tree')
157
 
        self.failUnlessExists('new/tree/.bzr')
 
157
        self.assertPathExists('new/tree/.bzr')
158
158
 
159
159
    def test_init_default_format_option(self):
160
160
        """bzr init should read default format from option default_format"""