Merge lp:~jelmer/bzr-builddeb/fix-check-tree-shape into lp:bzr-builddeb

[Jelmer Vernooij]

Cope with check_inventory_shape() being renamed to check_tree_shape()
in newer versions of bzr.

[James Westby (james-w)]

review: Approve

=== modified file 'tests/blackbox/test_import_dsc.py'
--- tests/blackbox/test_import_dsc.py	2010-05-28 00:36:04 +0000
+++ tests/blackbox/test_import_dsc.py	2011-05-04 15:12:30 +0000
@@ -101,9 +101,13 @@
     tree = self.make_branch_and_tree('.')
     self.run_bzr('import-dsc %s' % self.dsc_name)
     tree.lock_read()
+    expected_shape = ['README', 'debian/', 'debian/changelog',
+        'debian/control']
     try:
-      self.check_inventory_shape(tree.inventory,
-          ['README', 'debian/', 'debian/changelog', 'debian/control'])
+      if getattr(self, "check_tree_shape", None):
+        self.check_tree_shape(tree, expected_shape)
+      else:
+        self.check_inventory_shape(tree.inventory, expected_shape)
     finally:
       tree.unlock()
     self.assertEqual(len(tree.branch.revision_history()), 2)