← 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

(gz) Fix test failure on alpha by correcting format string for
 gc_chk_sha1_record (Martin [gz])

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