commit 2ad4b82d4520f554d547b70f5c65b2159ca98886
author Tao Bao <tbao@google.com> Thu Jun 27 16:52:12 2019 -0700
committer Tao Bao <tbao@google.com> Mon Jul 08 16:06:15 2019 -0700
tree 658f94dcb590590bd672ffad59beed0dbaf10671
parent 09736b4aafd9bd724bda87a65209587b4230c914

releasetools: Make merge_target_files and its test Python 3 compatible.

And a few minor clean-ups to the styling.

Bug: 131631303
Test: python -m unittest test_merge_target_files
Test: python3 -m unittest test_merge_target_files
Test: Use `python merge_target_files` to merge two target_files zips.
Test: Use `python3 merge_target_files` to merge two target_files zips.
Change-Id: I8502dfb243408f658d022e8d5e5fbb60066e4ff0

tools/releasetools/test_merge_target_files.py

diff --git a/tools/releasetools/test_merge_target_files.py b/tools/releasetools/test_merge_target_files.py
index b90a2e7..bca29e5 100644
--- a/tools/releasetools/test_merge_target_files.py
+++ b/tools/releasetools/test_merge_target_files.py
@@ -98,7 +98,8 @@
         'ROOT/*',
         'SYSTEM/*',
     ]
-    self.assertItemsEqual(framework_item_list, expected_framework_item_list)
+    self.assertEqual(sorted(framework_item_list),
+                     sorted(expected_framework_item_list))
 
   def test_validate_config_lists_ReturnsFalseIfMissingDefaultItem(self):
     framework_item_list = list(DEFAULT_FRAMEWORK_ITEM_LIST)