Index: tools/telemetry/catapult_base/dependency_manager/dependency_info_unittest.py |
diff --git a/tools/telemetry/catapult_base/dependency_manager/dependency_info_unittest.py b/tools/telemetry/catapult_base/dependency_manager/dependency_info_unittest.py |
index 7780e28a766c16298efb016e2f98b4b4d1063138..4fbc7713614ab49ed65c431e9ee91eab11040382 100644 |
--- a/tools/telemetry/catapult_base/dependency_manager/dependency_info_unittest.py |
+++ b/tools/telemetry/catapult_base/dependency_manager/dependency_info_unittest.py |
@@ -30,11 +30,12 @@ class DependencyInfoTest(unittest.TestCase): |
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) |
@@ -121,7 +122,7 @@ class DependencyInfoTest(unittest.TestCase): |
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( |
@@ -150,13 +151,14 @@ class DependencyInfoTest(unittest.TestCase): |
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) |
@@ -164,14 +166,14 @@ class DependencyInfoTest(unittest.TestCase): |
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) |
@@ -180,7 +182,7 @@ class DependencyInfoTest(unittest.TestCase): |
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): |
@@ -287,27 +289,37 @@ class DependencyInfoTest(unittest.TestCase): |
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_1 = [['path0'], ['path1', 'path3'], ['path5'], |
+ ['path6'], ['path2'], ['path4']] |
+ expected_local_paths_2 = [ |
+ ['path0'], ['path1', 'path3'], ['path5'], ['path6'], ['path2'], |
+ ['path4'], ['path7', 'path8'], ['path9']] |
- expected_local_paths = ['path0', 'path1', 'path3', 'path5', 'path6', |
- 'path2', 'path4'] |
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) |