commit 625fbeb1d9f458038077c603c8d6b4016a3b4e69
author Laurent Chavey <chavey@google.com> Wed Nov 11 16:17:56 2020 +0900
committer Commit Bot <commit-bot@chromium.org> Fri Nov 13 06:27:43 2020 +0000
tree 7f1bcf0cbe5889b1019adc7a07966c68a8d2dea0
parent 48b7ef38a95dd69bcf8405adf157f5a885d96f94

pre-submit: Fix comments from crrev/c/2526651.

Replace mockers by mocks.
Remove unused setup_initialized.
In @classmethod, use |cls| rather than |CheckFilesTest|.
In normal bound method, so use |self| rather than |CheckFilesTest|.
Revert changes with call to cros_test_lib.main.

BUG=chromium:1135047
TEST=run pre-upload_unittest.py

Change-Id: I1da5cf5e633d39aa2f6961f0ab5d769f58ebbe82
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/repohooks/+/2531257
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Laurent Chavey <chavey@google.com>
Commit-Queue: Laurent Chavey <chavey@google.com>

blocked_terms_unittest.py

diff --git a/blocked_terms_unittest.py b/blocked_terms_unittest.py
index 63b15b2..4318a03 100755
--- a/blocked_terms_unittest.py
+++ b/blocked_terms_unittest.py
@@ -46,15 +46,12 @@
 
   @classmethod
   def setUpClass(cls):
-    """Initialize the class instance mockers."""
-    CheckFilesTest.setup_initialized = True
-    CheckFilesTest.hooks_dir = pre_upload._get_hooks_dir()
-    CheckFilesTest.common_file_terms = pre_upload._read_terms_file(
-        os.path.join(CheckFilesTest.hooks_dir,
-                     pre_upload.BLOCKED_TERMS_FILE))
-    CheckFilesTest.unblocked_file_terms = pre_upload._read_terms_file(
-        os.path.join(CheckFilesTest.hooks_dir,
-                     pre_upload.UNBLOCKED_TERMS_FILE))
+    """Initialize the class instance mocks."""
+    cls.hooks_dir = pre_upload._get_hooks_dir()
+    cls.common_file_terms = pre_upload._read_terms_file(
+        os.path.join(cls.hooks_dir, pre_upload.BLOCKED_TERMS_FILE))
+    cls.unblocked_file_terms = pre_upload._read_terms_file(
+        os.path.join(cls.hooks_dir, pre_upload.UNBLOCKED_TERMS_FILE))
 
   def setUp(self):
     """Initialize the test instance mockers."""
@@ -68,7 +65,7 @@
     self.desc_mock = self.PatchObject(pre_upload, '_get_commit_desc')
     self.project = pre_upload.Project(name='PROJECT', dir='./', remote=None)
     self.hooks_dir_mock = self.PatchObject(pre_upload, '_get_hooks_dir')
-    self.hooks_dir_mock.return_value = CheckFilesTest.hooks_dir
+    self.hooks_dir_mock.return_value = self.hooks_dir
 
   def CheckKeyword(self, test):
     """Test a particular keyword.
@@ -89,12 +86,12 @@
         self.assertEqual(failures, [])
 
     # Check blocked terms.
-    self.rf_mock.side_effect = [CheckFilesTest.common_file_terms, set()]
+    self.rf_mock.side_effect = [self.common_file_terms, set()]
     _check_keyword(unblocked=False)
 
     # Check unblocked terms.
-    self.rf_mock.side_effect = [CheckFilesTest.common_file_terms,
-                                CheckFilesTest.unblocked_file_terms]
+    self.rf_mock.side_effect = [self.common_file_terms,
+                                self.unblocked_file_terms]
     _check_keyword(unblocked=True)
 
   def check_lines(self, blocked_lines, unblocked_lines):
@@ -164,4 +161,4 @@
 
 
 if __name__ == '__main__':
-  cros_test_lib.main(module='blocked_terms_unittest')
+  cros_test_lib.main(module=__name__)