Merge lp:~jelmer/bzr-builddeb/contains-upstream-source into lp:bzr-builddeb

[Jelmer Vernooij]

Add some tests for tree_contains_upstream_source.

Don't consider unversioned files when determining if the tree contains the upstream source.

[Andrew Bennetts (spiv)]

Makes sense to me. Perhaps add a changelog entry? :)

review: Approve

=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-07-20 19:14:43 +0000
+++ tests/test_util.py	2011-07-25 00:17:27 +0000
@@ -73,6 +73,7 @@
     strip_changelog_message,
     suite_to_distribution,
     tarball_name,
+    tree_contains_upstream_source,
     write_if_different,
     )
 
@@ -950,3 +951,44 @@
     def test_invalid_character(self):
         self.assertRaises(ValueError,
             component_from_orig_tarball, "foo_0.1.orig;.tar.gz", "foo", "0.1")
+
+
+class TreeContainsUpstreamSourceTests(TestCaseWithTransport):
+
+    def test_empty(self):
+        tree = self.make_branch_and_tree('.')
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertIs(None, tree_contains_upstream_source(tree))
+
+    def test_debian_dir_only(self):
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['debian/'])
+        tree.add(['debian'])
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertFalse(tree_contains_upstream_source(tree))
+
+    def test_debian_dir_and_bzr_builddeb(self):
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['debian/', '.bzr-builddeb/'])
+        tree.add(['debian', '.bzr-builddeb'])
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertFalse(tree_contains_upstream_source(tree))
+
+    def test_with_upstream_source(self):
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['debian/', 'src/'])
+        tree.add(['debian', 'src'])
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertTrue(tree_contains_upstream_source(tree))
+
+    def test_with_unversioned_extra_data(self):
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['debian/', 'x'])
+        tree.add(['debian'])
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertFalse(tree_contains_upstream_source(tree))
 
=== modified file 'util.py'
--- util.py	2011-07-20 19:23:07 +0000
+++ util.py	2011-07-25 00:17:27 +0000
@@ -625,7 +625,9 @@
     :return: Boolean indicating whether or not the tree contains the upstream
         source. None if the tree is empty
     """
-    present_files = set([f[0] for f in tree.list_files(recursive=False)])
+    present_files = set(
+        [f[0] for f in tree.list_files(recursive=False)
+         if f[1] == 'V'])
     if len(present_files) == 0:
         return None
     packaging_files = frozenset(["debian", ".bzr-builddeb", ".bzrignore"])