Merge lp:~jelmer/bzr-builddeb/test-get-export-upstream-revision into lp:bzr-builddeb

[Jelmer Vernooij]

Remove useless assignment from config.export_upstream_revision, as
get_export_upstream_revision already takes care of this for us.

Add tests for get_export_upstream_revision

=== modified file 'cmds.py'
--- cmds.py	2010-03-22 14:27:14 +0000
+++ cmds.py	2010-04-15 23:17:15 +0000
@@ -300,9 +300,6 @@
                 try:
                     if export_upstream_revision is None:
                         export_upstream_revision = \
-                               config.export_upstream_revision
-                    if export_upstream_revision is None:
-                        export_upstream_revision = \
                                     get_export_upstream_revision(config,
                                             version=version)
                     if export_upstream_revision is None:
 
=== modified file 'tests/test_util.py'
--- tests/test_util.py	2010-02-18 21:29:52 +0000
+++ tests/test_util.py	2010-04-15 23:17:15 +0000
@@ -27,6 +27,7 @@
 
 from debian_bundle.changelog import Changelog, Version
 
+from bzrlib.plugins.builddeb.config import DebBuildConfig
 from bzrlib.plugins.builddeb.errors import (MissingChangelogError,
                 AddChangelogError,
                 )
@@ -39,6 +40,7 @@
                   find_extra_authors,
                   find_last_distribution,
                   find_thanks,
+                  get_export_upstream_revision,
                   get_commit_info_from_changelog,
                   get_snapshot_revision,
                   lookup_distribution,
@@ -698,3 +700,28 @@
         changelog = self.create_changelog("UNRELEASED")
         self.assertEquals(None, find_last_distribution(changelog))
 
+
+class GetExportUpstreamRevisionTests(TestCase):
+
+    def test_snapshot_rev(self):
+        config = DebBuildConfig([])
+        self.assertEquals("34", 
+            get_export_upstream_revision(config, Version("0.1+bzr34-1")))
+
+    def test_export_upstream_rev(self):
+        config = DebBuildConfig([
+            ({"BUILDDEB": {"export-upstream-revision": "tag:foobar"}}, True)])
+        self.assertEquals("tag:foobar", 
+            get_export_upstream_revision(config, Version("0.1-1")))
+
+    def test_export_upstream_rev_var(self):
+        config = DebBuildConfig([({"BUILDDEB": 
+            {"export-upstream-revision": "tag:foobar-$UPSTREAM_VERSION"}},
+            True)])
+        self.assertEquals("tag:foobar-0.1", 
+            get_export_upstream_revision(config, Version("0.1-1")))
+
+    def test_export_upstream_rev_not_set(self):
+        config = DebBuildConfig([])
+        self.assertEquals(None, 
+            get_export_upstream_revision(config, Version("0.1-1")))