Add priority groups to local paths in the dependency manager.

tools/telemetry/catapult_base/dependency_manager/dependency_info_unittest.py

 # Copyright 2015 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 unittest
 
 from catapult_base.dependency_manager import dependency_info
 
 class DependencyInfoTest(unittest.TestCase):
   def testInitRequiredInfo(self):
@@ skipping 12 matching lines @@
     self.assertFalse(empty_di.cs_hash)
     self.assertFalse(empty_di.download_path)
     self.assertFalse(empty_di.cs_remote_path)
     self.assertFalse(empty_di.local_paths)
     self.assertEqual('dep', empty_di.dependency)
     self.assertEqual('plat', empty_di.platform)
     self.assertEqual(['config_file'], empty_di.config_files)
 
   def testInitLocalPaths(self):
     dep_info = dependency_info.DependencyInfo(
-        'dep', 'platform', 'config_file', local_paths=['path0', 'path1'])
+        'dep', 'platform', 'config_file',
+        local_paths=['path0', ['path1', 'path2']])
     self.assertEqual('dep', dep_info.dependency)
     self.assertEqual('platform', dep_info.platform)
     self.assertEqual(['config_file'], dep_info.config_files)
-    self.assertEqual(['path0', 'path1'], dep_info.local_paths)
+    self.assertEqual([['path0'], ['path1', 'path2']], dep_info.local_paths)
     self.assertFalse(dep_info.version_in_cs)
     self.assertFalse(dep_info.cs_hash)
     self.assertFalse(dep_info.cs_bucket)
     self.assertFalse(dep_info.cs_remote_path)
     self.assertFalse(dep_info.download_path)
 
   def testInitMinimumCloudStorageInfo(self):
     # Must specify cloud storage information atomically.
     self.assertRaises(ValueError, dependency_info.DependencyInfo, 'dep', 'plat',
                       'config_file', cs_bucket='cs_b')
@@ skipping 66 matching lines @@
         cs_remote_path='cs_remote_path', version_in_cs='version_in_cs',
         local_paths=['path'])
     self.assertEqual('dep', dep_info.dependency)
     self.assertEqual('platform', dep_info.platform)
     self.assertEqual(['config_file'], dep_info.config_files)
     self.assertEqual('cs_hash', dep_info.cs_hash)
     self.assertEqual('cs_bucket', dep_info.cs_bucket)
     self.assertEqual('cs_remote_path', dep_info.cs_remote_path)
     self.assertEqual('download_path', dep_info.download_path)
     self.assertEqual('version_in_cs', dep_info.version_in_cs)
-    self.assertEqual(['path'], dep_info.local_paths)
+    self.assertEqual([['path']], dep_info.local_paths)
 
   def testInitCloudStorageInfo(self):
     dep_info = dependency_info.DependencyInfo(
         'dep', 'platform', 'config_file', cs_bucket='cs_bucket',
         cs_hash='cs_hash', download_path='download_path',
         cs_remote_path='cs_remote_path')
     self.assertEqual('dep', dep_info.dependency)
     self.assertEqual('platform', dep_info.platform)
     self.assertEqual(['config_file'], dep_info.config_files)
     self.assertEqual('cs_hash', dep_info.cs_hash)
     self.assertEqual('cs_bucket', dep_info.cs_bucket)
     self.assertEqual('cs_remote_path', dep_info.cs_remote_path)
     self.assertEqual('download_path', dep_info.download_path)
     self.assertFalse(dep_info.version_in_cs)
     self.assertFalse(dep_info.local_paths)
 
     dep_info = dependency_info.DependencyInfo(
         'dep', 'platform', 'config_file', cs_bucket='cs_bucket',
         cs_hash='cs_hash', download_path='download_path',
         cs_remote_path='cs_remote_path', local_paths=['path'])
     self.assertEqual('dep', dep_info.dependency)
     self.assertEqual('platform', dep_info.platform)
     self.assertEqual(['config_file'], dep_info.config_files)
     self.assertEqual('cs_hash', dep_info.cs_hash)
     self.assertEqual('cs_bucket', dep_info.cs_bucket)
     self.assertEqual('cs_remote_path', dep_info.cs_remote_path)
     self.assertEqual('download_path', dep_info.download_path)
     self.assertFalse(dep_info.version_in_cs)
-    self.assertEqual(['path'], dep_info.local_paths)
+    self.assertEqual([['path']], dep_info.local_paths)
 
   def testInitAllInfo(self):
     dep_info = dependency_info.DependencyInfo(
         'dep', 'platform', 'config_file', cs_bucket='cs_bucket',
         cs_hash='cs_hash', download_path='download_path',
-        cs_remote_path='cs_remote_path', local_paths=['path0', 'path1'])
+        cs_remote_path='cs_remote_path',
+        local_paths=[['path0', 'path1'], 'path2'])
     self.assertEqual('dep', dep_info.dependency)
     self.assertEqual('platform', dep_info.platform)
     self.assertEqual(['config_file'], dep_info.config_files)
     self.assertEqual('cs_hash', dep_info.cs_hash)
     self.assertEqual('cs_bucket', dep_info.cs_bucket)
     self.assertEqual('cs_remote_path', dep_info.cs_remote_path)
     self.assertEqual('download_path', dep_info.download_path)
-    self.assertEqual(['path0', 'path1'], dep_info.local_paths)
+    self.assertEqual([['path0', 'path1'], ['path2']], dep_info.local_paths)
     self.assertFalse(dep_info.version_in_cs)
 
     dep_info = dependency_info.DependencyInfo(
         'dep', 'platform', 'config_file', cs_bucket='cs_bucket',
         cs_hash='cs_hash', download_path='download_path',
         cs_remote_path='cs_remote_path', version_in_cs='version_in_cs',
-        local_paths=['path0', 'path1'])
+        local_paths=[['path0', 'path1'], 'path2'])
     self.assertEqual('dep', dep_info.dependency)
     self.assertEqual('platform', dep_info.platform)
     self.assertEqual(['config_file'], dep_info.config_files)
     self.assertEqual('cs_hash', dep_info.cs_hash)
     self.assertEqual('cs_bucket', dep_info.cs_bucket)
     self.assertEqual('cs_remote_path', dep_info.cs_remote_path)
     self.assertEqual('download_path', dep_info.download_path)
     self.assertEqual('version_in_cs', dep_info.version_in_cs)
-    self.assertEqual(['path0', 'path1'], dep_info.local_paths)
+    self.assertEqual([['path0', 'path1'], ['path2']], dep_info.local_paths)
 
 
   def testUpdateRequiredArgsConflicts(self):
     dep_info1 = dependency_info.DependencyInfo(
         'dep1', 'platform1', 'config_file1', local_paths=['path0', 'path1'])
     dep_info2 = dependency_info.DependencyInfo(
         'dep1', 'platform2', 'config_file2', local_paths=['path0', 'path2'])
     dep_info3 = dependency_info.DependencyInfo(
         'dep2', 'platform1', 'config_file3', local_paths=['path0', 'path3'])
     self.assertRaises(ValueError, dep_info1.Update, dep_info2)
@@ skipping 86 matching lines @@
     dep_info4 = dependency_info.DependencyInfo(
         'dep1', 'platform1', 'config_file4', cs_bucket='cs_bucket',
         cs_hash='cs_hash', download_path='download_path',
         cs_remote_path='cs_remote_path', local_paths=['path4'])
 
     dep_info1.Update(dep_info2)
     self.assertEqual('cs_bucket', dep_info1.cs_bucket)
     self.assertEqual('cs_hash', dep_info1.cs_hash)
     self.assertEqual('download_path', dep_info1.download_path)
     self.assertEqual('cs_remote_path', dep_info1.cs_remote_path)
-    self.assertEqual(['path1', 'path2'], dep_info1.local_paths)
+    self.assertEqual([['path1'], ['path2']], dep_info1.local_paths)
 
     dep_info1.Update(dep_info3)
     self.assertEqual('cs_bucket', dep_info1.cs_bucket)
     self.assertEqual('cs_hash', dep_info1.cs_hash)
     self.assertEqual('download_path', dep_info1.download_path)
     self.assertEqual('cs_remote_path', dep_info1.cs_remote_path)
-    self.assertEqual(['path1', 'path2', 'path3'], dep_info1.local_paths)
+    self.assertEqual([['path1'], ['path2'], ['path3']], dep_info1.local_paths)
 
     self.assertRaises(ValueError, dep_info1.Update, dep_info4)
 
   def testAppendConflictingLocalFiles(self):
     dep_info1 = dependency_info.DependencyInfo(
         'dep1', 'platform1', 'config_file1',
-        local_paths=['path0', 'path1', 'path3', 'path5', 'path6'])
+        local_paths=['path0', ['path1', 'path3'], 'path5', 'path6'])
     dep_info2 = dependency_info.DependencyInfo(
         'dep1', 'platform1', 'config_file2',
-        local_paths=['path0', 'path2', 'path4', 'path5'])
+        local_paths=[['path0', 'path2'], 'path4', 'path5'])
+    dep_info3 = dependency_info.DependencyInfo(
+        'dep1', 'platform1', 'config_file3',
+        local_paths=[['path1', 'path2', 'path4', 'path7', 'path8'], 'path6',
+                     'path9'])
 
-    expected_local_paths = ['path0', 'path1', 'path3', 'path5', 'path6',
-                            'path2', 'path4']
+    expected_local_paths_1 = [['path0'], ['path1', 'path3'], ['path5'],
+                              ['path6'], ['path2'], ['path4']]
+    expected_local_paths_2 = [
+        ['path0'], ['path1', 'path3'], ['path5'], ['path6'], ['path2'],
+        ['path4'], ['path7', 'path8'], ['path9']]
+
     dep_info1.Update(dep_info2)
-    self.assertEquals(expected_local_paths, dep_info1.local_paths)
+    self.assertEquals(expected_local_paths_1, dep_info1.local_paths)
+    dep_info1.Update(dep_info3)
+    self.assertEquals(expected_local_paths_2, dep_info1.local_paths)