← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_inventory/basics.py

  • Committer: Andrew Bennetts
  • Date: 2010-08-17 06:45:33 UTC
  • mfrom: (5050.17.9 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: andrew.bennetts@canonical.com-20100817064533-kof2i2f3r6mr4ayb
Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859, #224373, #300062, #585667, #614404, #617503.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_inventory/basics.py
35
35
 
36
36
from bzrlib.tests.per_inventory import TestCaseWithInventory
37
37
 
38
 
from bzrlib.symbol_versioning import (
39
 
    deprecated_in,
40
 
    )
41
38
 
42
39
 
43
40
class TestInventory(TestCaseWithInventory):
152
149
        inv = self.inv_to_test_inv(inv)
153
150
        self.assertEqual(inv.path2id('src'), 'src-id')
154
151
        self.assertEqual(inv.path2id('src/bye.c'), 'bye-id')
155
 
        self.assertTrue(
156
 
            self.applyDeprecated(
157
 
                deprecated_in((2, 4, 0)),
158
 
                inv.__contains__, 'src-id'))
 
152
        self.assertTrue('src-id' in inv)
159
153
 
160
154
    def test_non_directory_children(self):
161
155
        """Test path2id when a parent directory has no children"""