~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_content_filters.py

(vila) Forbid more operations on ReadonlyTransportDecorator (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib.bzrdir import BzrDir
 
21
from bzrlib.controldir import ControlDir
22
22
from bzrlib.filters import ContentFilter
23
23
from bzrlib.switch import switch
24
24
from bzrlib.workingtree import WorkingTree
330
330
        self.assertFileEqual("fOO tXT", 'checkout/file1.txt')
331
331
 
332
332
        # Switch it to branch-b and check the tree is updated
333
 
        checkout_control_dir = BzrDir.open_containing('checkout')[0]
 
333
        checkout_control_dir = ControlDir.open_containing('checkout')[0]
334
334
        switch(checkout_control_dir, source.branch)
335
335
        self.assertFileEqual("fOO rocks!", 'checkout/file1.txt')
336
336
        self.assertFileEqual("hELLO wORLD", 'checkout/file4.txt')