~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

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