← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_clean_tree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-11 02:46:35 UTC
  • mfrom: (6017.1.2 test-isolation-speed)
  • Revision ID: pqm@pqm.ubuntu.com-20110711024635-f39c8kz23s347m1t
(spiv) Speed up TestCaseWithMemoryTransport._check_safety_net by reading the
 dirstate file directly rather than using WorkingTree.open(). (Andrew
 Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_clean_tree.py
19
19
import os
20
20
import shutil
21
21
import sys
 
22
import types
22
23
 
23
24
from bzrlib import tests, ui
24
 
from bzrlib.controldir import (
25
 
    ControlDir,
 
25
from bzrlib.bzrdir import (
 
26
    BzrDir,
26
27
    )
27
28
from bzrlib.clean_tree import (
28
29
    clean_tree,
42
43
        if has_symlinks() is False:
43
44
            return
44
45
        os.mkdir('branch')
45
 
        ControlDir.create_standalone_workingtree('branch')
 
46
        BzrDir.create_standalone_workingtree('branch')
46
47
        os.symlink(os.path.realpath('no-die-please'), 'branch/die-please')
47
48
        os.mkdir('no-die-please')
48
49
        self.assertPathExists('branch/die-please')
55
56
    def test_iter_deletable(self):
56
57
        """Files are selected for deletion appropriately"""
57
58
        os.mkdir('branch')
58
 
        tree = ControlDir.create_standalone_workingtree('branch')
 
59
        tree = BzrDir.create_standalone_workingtree('branch')
59
60
        transport = tree.bzrdir.root_transport
60
61
        transport.put_bytes('.bzrignore', '*~\n*.pyc\n.bzrignore\n')
61
62
        transport.put_bytes('file.BASE', 'contents')
121
122
        stderr = tests.StringIOWrapper()
122
123
        ui.ui_factory = tests.TestUIFactory(stdout=stdout, stderr=stderr)
123
124
 
124
 
        ControlDir.create_standalone_workingtree('.')
 
125
        BzrDir.create_standalone_workingtree('.')
125
126
        self.build_tree(['0foo', '1bar', '2baz', 'subdir0/'])
126
127
        clean_tree('.', unknown=True, no_prompt=True)
127
128
        self.assertContainsRe(stderr.getvalue(),