Enable saving the same file in multiple archives

scripts/common/archive_utils_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.
 
 import optparse
 import os
 import shutil
 import sys
 import tempfile
@@ skipping 92 matching lines @@
     'buildtype': ['dev'],
     'archive': 'renamed_direct_archive.txt',
     'direct_archive': 1,
   },
   {
     'filename': 'dev64_implied_direct_archive.txt',
     'arch': ['64bit'],
     'buildtype': ['dev'],
     'archive': 'dev64_implied_direct_archive.txt',
   },
+  {
+    'filename': 'archive_1.txt',
+    'buildtype': ['dev'],
+    'archive': 'archive_1.zip',
+  },
+  {
+    'filename': 'archive_2.txt',
+    'buildtype': ['dev'],
+    'archive': 'archive_2.zip',
+  },
+  {
+    'filename': 'multiple_archive.txt',
+    'buildtype': ['dev'],
+    'archive': 'archive_1.zip',
+  },
+  {
+    'filename': 'multiple_archive.txt',
+    'buildtype': ['dev'],
+    'archive': 'archive_2.zip',
+  },
 ]
 
 
 def CreateTestFilesCfg(path):
   files_cfg = os.path.join(path, archive_utils.FILES_FILENAME)
   f = open(files_cfg, 'w')
   f.write('FILES = %s' % str(TEST_FILES_CFG))
   f.close()
   return files_cfg
 
@@ skipping 201 matching lines @@
         self.assertNotIn(i['filename'], files_list)
       else:
         self.assertIn(i['filename'], files_list)
         files_list.remove(i['filename'])
         # No duplicate files.
         self.assertEqual(files_list.count(i['filename']), 0)
     # No unexpected files.
     self.assertEqual(len(files_list), 0)
 
   def testParseArchiveLists(self):
-    ARCHIVENAME = 'static_archive.zip'
+    STATIC_ARCHIVE = 'static_archive.zip'
+    ARCHIVE_1 = 'archive_1.zip'
+    ARCHIVE_2 = 'archive_2.zip'
+    ARCHIVENAMES = [STATIC_ARCHIVE, ARCHIVE_1, ARCHIVE_2]
     files_cfg = CreateTestFilesCfg(self.temp_dir)
     arch = '64bit'
     buildtype = 'official'
     fparser = archive_utils.FilesCfgParser(files_cfg, buildtype, arch)
     archives = fparser.ParseArchiveLists()
-    self.assertEqual(archives.keys(), [ARCHIVENAME])
-    self.assertEqual([x['filename'] for x in archives[ARCHIVENAME]],
+    self.assertEqual(archives.keys(), [STATIC_ARCHIVE])
+    self.assertItemsEqual([x['filename'] for x in archives[STATIC_ARCHIVE]],
                      ['archive_allany.txt', 'subdirectory/archive_allany.txt'])
 
     # 32bit dev has additional files under the same archive name.
     arch = '32bit'
     buildtype = 'dev'
     fparser = archive_utils.FilesCfgParser(files_cfg, buildtype, arch)
     archives = fparser.ParseArchiveLists()
-    self.assertEqual(archives.keys(), [ARCHIVENAME])
-    self.assertEqual([x['filename'] for x in archives[ARCHIVENAME]],
+    self.assertEqual(archives.keys(), ARCHIVENAMES)
+    self.assertItemsEqual([x['filename'] for x in archives[STATIC_ARCHIVE]],
                      ['archive_allany.txt', 'subdirectory/archive_allany.txt',
                       'subdirectory/archive_dev32.txt'])
+    self.assertItemsEqual([x['filename'] for x in archives[ARCHIVE_1]],
+                     ['multiple_archive.txt', 'archive_1.txt'])
+    self.assertItemsEqual([x['filename'] for x in archives[ARCHIVE_2]],
+                     ['multiple_archive.txt', 'archive_2.txt'])
 
   def testOptionalFiles(self):
     files_cfg = CreateTestFilesCfg(self.temp_dir)
     optional_fn = 'allany_dev_optional.txt'
     arch = '64bit'
     buildtype = 'dev'
     fparser = archive_utils.FilesCfgParser(files_cfg, buildtype, arch)
     self.assertTrue(fparser.IsOptional(optional_fn))
+    non_existent_fn = 'non_existent_fn.txt'
+    self.assertFalse(fparser.IsOptional(non_existent_fn))
 
     # It's only optional for 'dev' builds.
     buildtype = 'official'
     fparser = archive_utils.FilesCfgParser(files_cfg, buildtype, arch)
     self.assertFalse(fparser.IsOptional(optional_fn))
 
   def testDirectArchive(self):
     files_cfg = CreateTestFilesCfg(self.temp_dir)
     arch = '64bit'
     buildtype = 'dev'
@@ skipping 233 matching lines @@
         sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
         svn_client = pysvn.Client()
         DiffFilesCfg(RealFilesCfgTest.WIN_PATH, svn_client)
         DiffFilesCfg(RealFilesCfgTest.LINUX_PATH, svn_client)
         DiffFilesCfg(RealFilesCfgTest.MAC_PATH, svn_client)
         DiffFilesCfg(RealFilesCfgTest.CROS_PATH, svn_client)
 
   # Specify error return so caller (e.g. shell script) can easily detect
   # failures.
   sys.exit(errors)