Rev 3901: Add more tests for dotted revnos. (Marius Kruger) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3901
revision-id: pqm at pqm.ubuntu.com-20081212070030-93xnzs7f14962hti
parent: pqm at pqm.ubuntu.com-20081212043027-n6zyyf2q7usjiyid
parent: amanic at gmail.com-20081204195934-0jrq24ttncqpl9is
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-12-12 07:00:30 +0000
message:
  Add more tests for dotted revnos. (Marius Kruger)
modified:
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
    ------------------------------------------------------------
    revno: 3878.3.3
    revision-id: amanic at gmail.com-20081204195934-0jrq24ttncqpl9is
    parent: amanic at gmail.com-20081204195329-bygs4wrol90ridjr
    committer: Marius Kruger <amanic at gmail.com>
    branch nick: bzr.diff_dotted_revno_exception
    timestamp: Thu 2008-12-04 21:59:34 +0200
    message:
      Add tests for log -r with non-exising revno's
      (the doted case now gives correct error message)
    modified:
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
    ------------------------------------------------------------
    revno: 3878.3.2
    revision-id: amanic at gmail.com-20081204195329-bygs4wrol90ridjr
    parent: amanic at gmail.com-20081204190952-9eed0xghn96koab1
    committer: Marius Kruger <amanic at gmail.com>
    branch nick: bzr.diff_dotted_revno_exception
    timestamp: Thu 2008-12-04 21:53:29 +0200
    message:
      Add tests for log -c with non-exising revno's
      (the doted case now gives correct error message)
    modified:
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
    ------------------------------------------------------------
    revno: 3878.3.1
    revision-id: amanic at gmail.com-20081204190952-9eed0xghn96koab1
    parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
    committer: Marius Kruger <amanic at gmail.com>
    branch nick: bzr.diff_dotted_revno_exception
    timestamp: Thu 2008-12-04 21:09:52 +0200
    message:
      Test invalid dotted revion number directly in TestRevisionSpec_revno
    modified:
      bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2008-11-21 16:43:53 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2008-12-04 19:59:34 +0000
@@ -140,12 +140,36 @@
         self.assertTrue('branch nick: branch2\n' in log)
         self.assertTrue('branch nick: branch1\n' not in log)
 
+    def test_log_nonexistent_revno(self):
+        self._prepare()
+        (out, err) = self.run_bzr_error(args="log -r 1234",
+            error_regexes=["bzr: ERROR: Requested revision: '1234' "
+                "does not exist in branch:"])
+
+    def test_log_nonexistent_dotted_revno(self):
+        self._prepare()
+        (out, err) = self.run_bzr_error(args="log -r 123.123",
+            error_regexes=["bzr: ERROR: Requested revision: '123.123' "
+                "does not exist in branch:"])
+
     def test_log_change_revno(self):
         self._prepare()
         expected_log = self.run_bzr("log -r 1")[0]
         log = self.run_bzr("log -c 1")[0]
         self.assertEqualDiff(expected_log, log)
 
+    def test_log_change_nonexistent_revno(self):
+        self._prepare()
+        (out, err) = self.run_bzr_error(args="log -c 1234",
+            error_regexes=["bzr: ERROR: Requested revision: '1234' "
+                "does not exist in branch:"])
+
+    def test_log_change_nonexistent_dotted_revno(self):
+        self._prepare()
+        (out, err) = self.run_bzr_error(args="log -c 123.123",
+            error_regexes=["bzr: ERROR: Requested revision: '123.123' "
+                "does not exist in branch:"])
+
     def test_log_change_single_revno(self):
         self._prepare()
         self.run_bzr_error('bzr: ERROR: Option --change does not'

=== modified file 'bzrlib/tests/test_revisionspec.py'
--- a/bzrlib/tests/test_revisionspec.py	2008-08-28 13:41:15 +0000
+++ b/bzrlib/tests/test_revisionspec.py	2008-12-04 19:09:52 +0000
@@ -176,6 +176,7 @@
 
     def test_dotted_decimal(self):
         self.assertInHistoryIs(None, 'alt_r2', '1.1.1')
+        self.assertInvalid('1.1.123')
 
     def test_negative_int(self):
         self.assertInHistoryIs(2, 'r2', '-1')