/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_add.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-20 11:07:31 UTC
  • mfrom: (5340.12.29 2.4-613247-test-cases)
  • Revision ID: pqm@pqm.ubuntu.com-20110520110731-8slefcqat6dr3asl
(jameinel) Bug #613247,
 clean up a bunch of test cases to avoid putting 'self' in the reference
 cycle. (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_add.py
115
115
        self.assertNotEqual(None, c_id)
116
116
        self.base_tree.lock_read()
117
117
        self.addCleanup(self.base_tree.unlock)
118
 
        self.failIf(c_id in self.base_tree)
 
118
        self.assertFalse(c_id in self.base_tree)
119
119
 
120
120
        d_id = new_tree.path2id('subdir/d')
121
121
        self.assertNotEqual(None, d_id)
122
 
        self.failIf(d_id in self.base_tree)
 
122
        self.assertFalse(d_id in self.base_tree)
123
123
 
124
124
    def test_copy_existing_dir(self):
125
125
        self.make_base_tree()
140
140
        self.assertNotEqual(None, a_id)
141
141
        self.base_tree.lock_read()
142
142
        self.addCleanup(self.base_tree.unlock)
143
 
        self.failIf(a_id in self.base_tree)
 
143
        self.assertFalse(a_id in self.base_tree)
144
144
 
145
145
 
146
146
class TestAddActions(tests.TestCase):