[Pkg-bazaar-commits] r116 ./bzr-builddeb/people/jdw/merge_upstream: Test that the merge_upstream handles an invlid revision_id.

[James Westby]

------------------------------------------------------------
revno: 116
committer: James Westby <jw+debian at jameswestby.net>
branch nick: merge-upstream.siretart
timestamp: Fri 2007-06-22 17:45:21 +0100
message:
  Test that the merge_upstream handles an invlid revision_id.
modified:
  tests/test_merge_upstream.py
-------------- next part --------------
=== modified file 'tests/test_merge_upstream.py'
--- a/tests/test_merge_upstream.py	2007-06-22 16:39:09 +0000
+++ b/tests/test_merge_upstream.py	2007-06-22 16:45:21 +0000
@@ -22,7 +22,9 @@
 import shutil
 import tarfile
 
-from bzrlib.errors import BzrCommandError
+from bzrlib.errors import (BzrCommandError,
+                           InvalidRevisionSpec,
+                           )
 from bzrlib.revisionspec import RevisionSpec
 from bzrlib.tests import TestCaseWithTransport
 
@@ -142,6 +144,13 @@
     self.assertRaises(BzrCommandError, merge_upstream, self.wt, 'source',
                       make_revspec(old_upstream_revision))
 
+  def test_merge_upstream_handles_invalid_revision(self):
+    self.make_first_upstream_commit()
+    self.make_first_debian_commit()
+    self.make_new_upstream_tarball()
+    self.assertRaises(InvalidRevisionSpec, merge_upstream, self.wt,
+                      self.upstream_tarball, make_revspec('NOTAREVID'))
+
 class TestConflictMergeUpstreamNormal(TestCaseWithTransport):
   """Test merge upstream with conflicts in the new version."""