← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_add.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-08 10:46:39 UTC
  • mfrom: (5012.2.3 integration2)
  • Revision ID: pqm@pqm.ubuntu.com-20100208104639-3gzaq1d5snphj178
(vila)(trivial) Fix imports in test_smart_add.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_add.py
16
16
 
17
17
from cStringIO import StringIO
18
18
 
19
 
from bzrlib import osutils
20
 
from bzrlib.add import (
21
 
    AddAction,
22
 
    AddFromBaseAction,
 
19
from bzrlib import (
 
20
    add,
 
21
    inventory,
 
22
    osutils,
 
23
    tests,
23
24
    )
24
 
from bzrlib.tests import TestCase, TestCaseWithTransport
25
 
from bzrlib.inventory import Inventory
26
 
 
27
 
 
28
 
class AddCustomIDAction(AddAction):
 
25
 
 
26
 
 
27
class AddCustomIDAction(add.AddAction):
29
28
 
30
29
    def __call__(self, inv, parent_ie, path, kind):
31
30
        # The first part just logs if appropriate
39
38
        return file_id
40
39
 
41
40
 
42
 
class TestAddFrom(TestCaseWithTransport):
 
41
class TestAddFrom(tests.TestCaseWithTransport):
43
42
    """Tests for AddFromBaseAction"""
44
43
 
45
44
    def make_base_tree(self):
60
59
        try:
61
60
            new_tree.lock_write()
62
61
            try:
63
 
                action = AddFromBaseAction(base_tree, base_path,
64
 
                                           to_file=to_file,
65
 
                                           should_print=should_print)
 
62
                action = add.AddFromBaseAction(base_tree, base_path,
 
63
                                               to_file=to_file,
 
64
                                               should_print=should_print)
66
65
                new_tree.smart_add(file_list, action=action)
67
66
            finally:
68
67
                new_tree.unlock()
144
143
        self.failIf(a_id in self.base_tree)
145
144
 
146
145
 
147
 
class TestAddActions(TestCase):
 
146
class TestAddActions(tests.TestCase):
148
147
 
149
148
    def test_quiet(self):
150
149
        self.run_action("")
153
152
        self.run_action("adding path\n")
154
153
 
155
154
    def run_action(self, output):
156
 
        from bzrlib.add import AddAction
157
155
        from bzrlib.mutabletree import _FastPath
158
 
        inv = Inventory()
 
156
        inv = inventory.Inventory()
159
157
        stdout = StringIO()
160
 
        action = AddAction(to_file=stdout, should_print=bool(output))
 
158
        action = add.AddAction(to_file=stdout, should_print=bool(output))
161
159
 
162
160
        self.apply_redirected(None, stdout, None, action, inv, None,
163
161
            _FastPath('path'), 'file')