← 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

  • Committer: Martin Pool
  • Date: 2011-03-28 01:28:09 UTC
  • mto: (5425.4.19 220464-stale-locks)
  • mto: This revision was merged to the branch mainline in revision 5970.
  • Revision ID: mbp@canonical.com-20110328012809-frw003r09tcrxkiz
Represent lock held info as an object, not just a dict

Show diffs side-by-side

added added

removed removed

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