commit 678735cc21f8254632188153f92f4ae2051b7b46
author Mike Frysinger <vapier@chromium.org> Sat Sep 28 18:23:28 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Oct 01 05:24:45 2019 +0000
tree 3a3f95a36a0e5fdf327b52b45059f9398aa135a9
parent b8d4dba43eb0ad391ebabb26ca6433b6a65960b2

unittests: handle some renamed assert methods

Python 3 renamed assert{ItemsEqual,RaisesRegexp,RegexpMatches} to
assert{CountEqual,RaisesRegex,Regex}.  Add our own handlers so we
can migrate our code now.

BUG=chromium:980619
TEST=`cros lint` is unchanged

Change-Id: I21cd4ce0b8ec6757422028d0228fea9e91cb2b1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1829816
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

api/controller/artifacts_unittest.py

diff --git a/api/controller/artifacts_unittest.py b/api/controller/artifacts_unittest.py
index eaa34de..38b2e2e 100644
--- a/api/controller/artifacts_unittest.py
+++ b/api/controller/artifacts_unittest.py
@@ -134,7 +134,7 @@
     artifacts.BundleImageArchives(self.target_request, self.response,
                                   self.api_config)
 
-    self.assertItemsEqual(expected, [a.path for a in self.response.artifacts])
+    self.assertCountEqual(expected, [a.path for a in self.response.artifacts])
 
 
 class BundleImageZipTest(BundleTestCase):
@@ -199,7 +199,7 @@
     # Verify the output proto is being populated correctly.
     self.assertTrue(self.response.artifacts)
     paths = [artifact.path for artifact in self.response.artifacts]
-    self.assertItemsEqual(files.values(), paths)
+    self.assertCountEqual(files.values(), paths)
 
   def testBundleAutotestFiles(self):
     """BundleAutotestFiles calls service correctly."""
@@ -219,7 +219,7 @@
     # Verify the output proto is being populated correctly.
     self.assertTrue(self.response.artifacts)
     paths = [artifact.path for artifact in self.response.artifacts]
-    self.assertItemsEqual(files.values(), paths)
+    self.assertCountEqual(files.values(), paths)
 
   def testInvalidOutputDir(self):
     """Test invalid output directory argument."""
@@ -517,13 +517,13 @@
         for artifact in self.output_proto.artifacts
     ]
     expected = ['payload1.bin', 'payload2.bin']
-    self.assertItemsEqual(actual, expected)
+    self.assertCountEqual(actual, expected)
 
     actual = [
         os.path.relpath(path, self.archive_root)
         for path in osutils.DirectoryIterator(self.archive_root)
     ]
-    self.assertItemsEqual(actual, expected)
+    self.assertCountEqual(actual, expected)
 
   def testBundleTestUpdatePayloadsNoImageDir(self):
     """BundleTestUpdatePayloads dies if no image dir is found."""
@@ -638,7 +638,7 @@
     artifacts.BundleSimpleChromeArtifacts(request, response, self.api_config)
 
     self.assertTrue(response.artifacts)
-    self.assertItemsEqual(expected_files, [a.path for a in response.artifacts])
+    self.assertCountEqual(expected_files, [a.path for a in response.artifacts])
 
 
 class BundleVmFilesTest(cros_test_lib.MockTempDirTestCase,
@@ -864,7 +864,7 @@
                                             self.api_config)
 
     self.assertTrue(self.response.artifacts)
-    self.assertItemsEqual(expected_files,
+    self.assertCountEqual(expected_files,
                           [a.path for a in self.response.artifacts])
 
   def testOutputHandlingOnAFDO(self):