← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

add gettext to all the builtin commands outf usage

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_checkout.py
32
32
    TestCaseWithTransport,
33
33
    )
34
34
from bzrlib.tests import (
 
35
    KnownFailure,
 
36
    )
 
37
from bzrlib.tests.features import (
35
38
    HardlinkFeature,
36
 
    KnownFailure,
37
39
    )
38
40
 
39
41
 
69
71
        # from 1.
70
72
        result = bzrdir.BzrDir.open('checkout')
71
73
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
72
 
        self.failIfExists('checkout/added_in_2')
 
74
        self.assertPathDoesNotExist('checkout/added_in_2')
73
75
 
74
76
    def test_checkout_light_dash_r(self):
75
77
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
78
80
        # from 1.
79
81
        result = bzrdir.BzrDir.open('checkout')
80
82
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
81
 
        self.failIfExists('checkout/added_in_2')
 
83
        self.assertPathDoesNotExist('checkout/added_in_2')
82
84
 
83
85
    def test_checkout_reconstitutes_working_trees(self):
84
86
        # doing a 'bzr checkout' in the directory of a branch with no tree
124
126
            cmd.append('--lightweight')
125
127
        self.run_bzr('checkout source target')
126
128
        # files with unique content should be moved
127
 
        self.failUnlessExists('target/file2.moved')
 
129
        self.assertPathExists('target/file2.moved')
128
130
        # files with content matching tree should not be moved
129
 
        self.failIfExists('target/file1.moved')
 
131
        self.assertPathDoesNotExist('target/file1.moved')
130
132
 
131
133
    def test_checkout_existing_dir_heavy(self):
132
134
        self._test_checkout_existing_dir(False)