← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin
  • Date: 2010-06-22 00:32:37 UTC
  • mto: This revision was merged to the branch mainline in revision 5315.
  • Revision ID: gzlist@googlemail.com-20100622003237-zntnpyx8hjb5jnpw
Change interface of _command_line_to_argv so old tests can still be used with new stripping logic

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_switch.py
22
22
 
23
23
from bzrlib import osutils
24
24
from bzrlib.workingtree import WorkingTree
25
 
from bzrlib.tests import TestCaseWithTransport
 
25
from bzrlib.tests.blackbox import ExternalBase
26
26
from bzrlib.directory_service import directories
27
27
 
28
28
 
29
 
class TestSwitch(TestCaseWithTransport):
 
29
class TestSwitch(ExternalBase):
30
30
 
31
31
    def _create_sample_tree(self):
32
32
        tree = self.make_branch_and_tree('branch-1')
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.assertPathExists('checkout/file-1')
153
 
        self.assertPathDoesNotExist('checkout/file-2')
 
152
        self.failUnlessExists('checkout/file-1')
 
153
        self.failIfExists('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.assertPathExists('checkout/file-1')
159
 
        self.assertPathExists('checkout/file-2')
 
158
        self.failUnlessExists('checkout/file-1')
 
159
        self.failUnlessExists('checkout/file-2')
160
160
        self.run_bzr(['switch', '-r1'], working_dir='checkout')
161
 
        self.assertPathExists('checkout/file-1')
162
 
        self.assertPathDoesNotExist('checkout/file-2')
 
161
        self.failUnlessExists('checkout/file-1')
 
162
        self.failIfExists('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'],