← Back to branch summary

~bzr/ubuntu/hardy/bzr/beta-ppa

« back to all changes in this revision

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

  • Committer: Max Bowsher
  • Date: 2011-04-30 17:14:51 UTC
  • mfrom: (3876.1.10 jaunty)
  • Revision ID: maxb@f2s.com-20110430171451-74ydto59tdotsxa6
Merge 2.4.0~beta2-2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_switch.py
149
149
        tree = self._create_sample_tree()
150
150
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
151
151
        self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout')
152
 
        self.failUnlessExists('checkout/file-1')
153
 
        self.failIfExists('checkout/file-2')
 
152
        self.assertPathExists('checkout/file-1')
 
153
        self.assertPathDoesNotExist('checkout/file-2')
154
154
 
155
155
    def test_switch_only_revision(self):
156
156
        tree = self._create_sample_tree()
157
157
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
158
 
        self.failUnlessExists('checkout/file-1')
159
 
        self.failUnlessExists('checkout/file-2')
 
158
        self.assertPathExists('checkout/file-1')
 
159
        self.assertPathExists('checkout/file-2')
160
160
        self.run_bzr(['switch', '-r1'], working_dir='checkout')
161
 
        self.failUnlessExists('checkout/file-1')
162
 
        self.failIfExists('checkout/file-2')
 
161
        self.assertPathExists('checkout/file-1')
 
162
        self.assertPathDoesNotExist('checkout/file-2')
163
163
        # Check that we don't accept a range
164
164
        self.run_bzr_error(
165
165
            ['bzr switch --revision takes exactly one revision identifier'],