Merge lp:~jelmer/bzr-builddeb/version-as-rev-nosuchtag into lp:~jelmer/bzr-builddeb/716854-fix-build

[Jelmer Vernooij]

Make PristineTarSource.version_as_revision() raise a PackageVersionNotPresent error, as expected by callers.

Unmerged revisions

521. By Jelmer Vernooij on 2011-02-12

Add tests for missing tags in PristineTarSource.version_as_revision.

520. By Jelmer Vernooij on 2011-02-11

Merge build fixes.

519. By Jelmer Vernooij on 2011-02-11

Merge addition of more PristineTarSource tests.

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-02-04 11:30:52 +0000
+++ tests/test_upstream.py	2011-02-12 01:43:14 +0000
@@ -22,6 +22,7 @@
 
 """Tests for the upstream module."""
 
+from base64 import standard_b64encode
 
 import os
 import tarfile
@@ -531,11 +532,49 @@
         self.assertEqual(self.source.tag_name(upstream_v_no),
                 "upstream-" + upstream_v_no)
 
+    def test_tag_name_distro(self):
+        self.assertEquals(self.source.tag_name("0.3", "ubuntu"),
+                "upstream-ubuntu-0.3")
+
     def test_version(self):
         self.assertEquals(['upstream-3.3', 'upstream-debian-3.3',
             'upstream-ubuntu-3.3', 'upstream/3.3'],
             self.source.possible_tag_names("3.3"))
 
+    def test_pristine_tar_format_gz(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta"] = "1"
+        self.assertEquals("gz", self.source.pristine_tar_format(rev))
+
+    def test_pristine_tar_format_bz2(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta-bz2"] = "1"
+        self.assertEquals("bz2", self.source.pristine_tar_format(rev))
+
+    def test_pristine_tar_format_unknown(self):
+        rev = Revision("myrevid")
+        self.assertRaises(AssertionError,
+            self.source.pristine_tar_format, rev)
+
+    def test_pristine_tar_delta_unknown(self):
+        rev = Revision("myrevid")
+        self.assertRaises(AssertionError,
+            self.source.pristine_tar_delta, rev)
+
+    def test_pristine_tar_delta_gz(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta"] = standard_b64encode("bla")
+        self.assertEquals("bla", self.source.pristine_tar_delta(rev))
+
+    def test_version_as_revision_missing(self):
+        self.assertRaises(PackageVersionNotPresent,
+            self.source.version_as_revision, None, "1.2")
+
+    def test_version_as_revision(self):
+        revid1 = self.tree.commit("msg")
+        self.tree.branch.tags.set_tag("upstream-2.1", revid1)
+        self.assertEquals(revid1, self.source.version_as_revision(None, "2.1"))
+
 
 class TarfileSourceTests(TestCaseWithTransport):
     """Tests for TarfileSource."""

=== modified file 'upstream/__init__.py'
--- upstream/__init__.py	2011-02-11 14:29:07 +0000
+++ upstream/__init__.py	2011-02-12 01:43:14 +0000
@@ -37,6 +37,7 @@
 
 from bzrlib.errors import (
     NoSuchRevision,
+    NoSuchTag,
     )
 from bzrlib.trace import (
     note,
@@ -169,7 +170,10 @@
             if self._has_version(tag_name):
                 return self.branch.tags.lookup_tag(tag_name)
         tag_name = self.tag_name(version)
-        return self.branch.tags.lookup_tag(tag_name)
+        try:
+            return self.branch.tags.lookup_tag(tag_name)
+        except NoSuchTag:
+            raise PackageVersionNotPresent(package, version, self)
 
     def has_version(self, package, version, md5=None):
         assert isinstance(version, str), str(type(version))