Treat packages with missing SHA1 as not duplicated.

prebuilt_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import mox
 import os
 import prebuilt
 import shutil
@@ skipping 203 matching lines @@
 
   def testNormalIndex(self):
     pkgindex = SimplePackageIndex()
     db = {}
     pkgindex._PopulateDuplicateDB(db)
     self.assertEqual(len(db), 3)
     self.assertEqual(db['1'], 'http://www.example.com/public1.tbz2')
     self.assertEqual(db['2'], 'http://www.example.com/foo.tgz')
     self.assertEqual(db['3'], 'http://www.example.com/private.tbz2')
 
+  def testMissingSHA1(self):
+    db = {}
+    pkgindex = SimplePackageIndex()
+    del pkgindex.packages[0]['SHA1']
+    pkgindex._PopulateDuplicateDB(db)
+    self.assertEqual(len(db), 2)
+    self.assertEqual(db['2'], 'http://www.example.com/foo.tgz')
+    self.assertEqual(db['3'], 'http://www.example.com/private.tbz2')
+
   def testFailedPopulate(self):
     db = {}
     pkgindex = SimplePackageIndex(header=False)
     self.assertRaises(KeyError, pkgindex._PopulateDuplicateDB, db)
     pkgindex = SimplePackageIndex()
     del pkgindex.packages[0]['CPV']
     self.assertRaises(KeyError, pkgindex._PopulateDuplicateDB, db)
-    pkgindex = SimplePackageIndex()
-    del pkgindex.packages[0]['SHA1']
-    self.assertRaises(KeyError, pkgindex._PopulateDuplicateDB, db)
 
 
 class TestResolveDuplicateUploads(unittest.TestCase):
 
   def testEmptyList(self):
     pkgindex = SimplePackageIndex()
     pristine = SimplePackageIndex()
     uploads = pkgindex.ResolveDuplicateUploads([])
     self.assertEqual(uploads, pristine.packages)
     self.assertEqual(pkgindex.packages, pristine.packages)
@@ skipping 10 matching lines @@
 
   def testDuplicates(self):
     pkgindex = SimplePackageIndex()
     dup_pkgindex = SimplePackageIndex()
     expected_pkgindex = SimplePackageIndex()
     for pkg in expected_pkgindex.packages:
       pkg.setdefault('PATH', pkg['CPV'] + '.tbz2')
     uploads = pkgindex.ResolveDuplicateUploads([dup_pkgindex])
     self.assertEqual(pkgindex.packages, expected_pkgindex.packages)
 
+  def testMissingSHA1(self):
+    db = {}
+    pkgindex = SimplePackageIndex()
+    dup_pkgindex = SimplePackageIndex()
+    expected_pkgindex = SimplePackageIndex()
+    del pkgindex.packages[0]['SHA1']
+    del expected_pkgindex.packages[0]['SHA1']
+    for pkg in expected_pkgindex.packages[1:]:
+      pkg.setdefault('PATH', pkg['CPV'] + '.tbz2')
+    uploads = pkgindex.ResolveDuplicateUploads([dup_pkgindex])
+    self.assertEqual(pkgindex.packages, expected_pkgindex.packages)
+
 
 class TestWritePackageIndex(unittest.TestCase):
 
   def setUp(self):
     self.mox = mox.Mox()
 
   def tearDown(self):
     self.mox.UnsetStubs()
     self.mox.VerifyAll()
 
   def testSimple(self):
     pkgindex = SimplePackageIndex()
     self.mox.StubOutWithMock(pkgindex, 'Write')
     pkgindex.Write(mox.IgnoreArg())
     self.mox.ReplayAll()
     f = pkgindex.WriteToNamedTemporaryFile()
     self.assertEqual(f.read(), '')
 
 
 if __name__ == '__main__':
   unittest.main()