~bzr-pqm/bzr/bzr.dev

One code path was using a tuple, another a plain path
we need to support *both*. Relatively simple fix after that.

added added

removed removed

409

self.assertCmpByDirblock(1, u'a-a/a/a', u'a/a/a')

410

self.assertCmpByDirblock(1, u'a=a/a/a', u'a/a/a')

411

412

def assertPathKey(self, expected, path):

413

self.assertEqual(expected, _mod_tree.MultiWalker._path_key(path))

412

def assertPathToKey(self, expected, path):

413

self.assertEqual(expected, _mod_tree.MultiWalker._path_to_key(path))

414

415

def test__path_key(self):

416

self.assertPathKey(([u''], u''), u'')

417

self.assertPathKey(([u''], u'a'), u'a')

418

self.assertPathKey(([u'a'], u'b'), u'a/b')

419

self.assertPathKey(([u'a', u'b'], u'c'), u'a/b/c')

415

def test__path_to_key(self):

416

self.assertPathToKey(([u''], u''), u'')

417

self.assertPathToKey(([u''], u'a'), u'a')

418

self.assertPathToKey(([u'a'], u'b'), u'a/b')

419

self.assertPathToKey(([u'a', u'b'], u'c'), u'a/b/c')