Rev 2748: Tighten the revision store implementation tests surrounding the in http://people.ubuntu.com/~robertc/baz2.0/misc-fixen

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/misc-fixen

------------------------------------------------------------
revno: 2748
revision-id: robertc at robertcollins.net-20070822234336-pl9dspu4z6kbt8lg
parent: robertc at robertcollins.net-20070822223223-0heetwybcuonp00g
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Thu 2007-08-23 09:43:36 +1000
message:
  Tighten the revision store implementation tests surrounding the
  None/null: difference. (Robert Collins)
modified:
  bzrlib/store/revision/text.py  text.py-20060303020652-e49155f0da4d14ab
  bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
=== modified file 'bzrlib/store/revision/text.py'
--- a/bzrlib/store/revision/text.py	2007-07-10 21:18:54 +0000
+++ b/bzrlib/store/revision/text.py	2007-08-22 23:43:36 +0000
@@ -108,6 +108,7 @@
         return revisions
 
     def _get_revision_xml_file(self, revision_id):
+        _mod_revision.check_not_reserved_id(revision_id)
         try:
             return self.text_store.get(revision_id)
         except (IndexError, KeyError):

=== modified file 'bzrlib/tests/revisionstore_implementations/test_all.py'
--- a/bzrlib/tests/revisionstore_implementations/test_all.py	2007-08-22 22:28:07 +0000
+++ b/bzrlib/tests/revisionstore_implementations/test_all.py	2007-08-22 23:43:36 +0000
@@ -58,8 +58,8 @@
         # has of a non present id -> False
         self.assertFalse(self.store.has_revision_id('missing', self.transaction))
 
-    def test_has_None(self):
-        # has of None -> True
+    def test_has_null(self):
+        # has of null -> True
         self.assertTrue(self.store.has_revision_id('null:', self.transaction))
 
     def test_get_revision_missing(self):
@@ -69,11 +69,11 @@
                           'B',
                           self.transaction)
 
-    def test_get_revision_none(self):
-        # get_revision(None) -> raises NoSuchRevision
-        self.assertRaises(errors.NoSuchRevision,
+    def test_get_revision_null(self):
+        # get_revision(null) -> raises ReservedId
+        self.assertRaises(errors.ReservedId,
                           self.store.get_revision,
-                          None,
+                          'null:',
                           self.transaction)
 
     def test_add_signature_text_missing(self):