scm.GIT.IsValidRevision: Only return True if the given object is a commit

tests/scm_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for scm.py."""
 
 import logging
 import os
 import sys
+import tempfile
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support import fake_repos
 from testing_support.super_mox import SuperMoxTestBase
 
 import scm
 import subprocess2
 
@@ skipping 113 matching lines @@
     if not self.enabled:
       return
     # Sha1's are [0-9a-z]{32}, so starting with a 'z' or 'r' should always fail.
     self.assertFalse(scm.GIT.IsValidRevision(cwd=self.clone_dir, rev='zebra'))
     self.assertFalse(scm.GIT.IsValidRevision(cwd=self.clone_dir, rev='r123456'))
     # Valid cases
     first_rev = self.githash('repo_1', 1)
     self.assertTrue(scm.GIT.IsValidRevision(cwd=self.clone_dir, rev=first_rev))
     self.assertTrue(scm.GIT.IsValidRevision(cwd=self.clone_dir, rev='HEAD'))
 
+    # Verify that IsValidRevision returns False for non-commit objects.
+    tmp = tempfile.NamedTemporaryFile(delete=False)
+    try:
+      tmp.write('This is not a commit')
+      tmp.close()
+      hashval = scm.GIT.Capture(['hash-object', '-w', tmp.name],
+                                cwd=self.clone_dir)
+    finally:
+      os.remove(tmp.name)
+    self.assertFalse(scm.GIT.IsValidRevision(cwd=self.clone_dir, rev=hashval))
+
 
 class RealGitSvnTest(fake_repos.FakeReposTestBase):
   def setUp(self):
     super(RealGitSvnTest, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_git() and self.FAKE_REPOS.set_up_svn()
     if self.enabled:
       self.tree_name = 'git-svn'
       self.svn_url = scm.os.path.join(self.FAKE_REPOS.svn_base, 'trunk')
       self.clone_dir = scm.os.path.join(self.FAKE_REPOS.git_root,
                                         self.tree_name)
@@ skipping 328 matching lines @@
     # Asserting the tree is not sufficient, svn status must come out clear too.
     self.assertEquals('', self._capture(['status']))
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(level=logging.DEBUG)
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: