Add unit test and lint the files

Author: qyeo-sc

src/clusterfuzz/_internal/issue_management/jira/issue_tracker_manager.py

@@ -18,6 +18,7 @@
 import jira
 
 from clusterfuzz._internal.config import db_config
+from clusterfuzz._internal.metrics import logs
 
 
 class IssueTrackerManager:
@@ -88,7 +89,7 @@ def _add_watchers(self, issue, update_if_different=False):
 
     if update_if_different:
       # Only add the missing watchers
-      watchers = watchers - set(self.get_watchers(issue))
+      watchers = watchers - set(self.get_watchers(issue.jira_issue))
 
     # Jira weirdness, update watchers this way.
     for watcher in watchers:

src/clusterfuzz/_internal/tests/appengine/libs/issue_management/jira/jira_test.py

@@ -183,3 +183,44 @@ def test_issue_save(self):
     self.mock.client.add_comment.assert_called_with(self.mock_issue.jira_issue,
                                                     'test comments')
     self.assertEqual(issue.status, 'Closed')
+
+  def test_issue_save_only_update_missing_watchers(self):
+    """Test save only update missing watchers for existing issue."""
+    self.mock.get_issue.return_value = self.mock_issue
+    self.mock_issue.ccs.add('[email protected]')
+    self.mock_issue.ccs.add('[email protected]')
+    self.mock.get_watchers.return_value = ['[email protected]']
+    issue = self.issue_tracker.get_issue('VSEC-3112')
+    issue.save(new_comment='test comments')
+    self.mock.get_watchers.assert_called()
+    self.mock.client.add_comment.assert_called_with(self.mock_issue.jira_issue,
+                                                    'test comments')
+    self.mock.client.add_watcher.assert_has_calls(
+        [
+            unittest.mock.call(self.mock_issue.jira_issue,
+                               '[email protected]'),
+            unittest.mock.call(self.mock_issue.jira_issue, '[email protected]')
+        ],
+        any_order=True)
+
+  def test_issue_save_bad_watcher(self):
+    """Test save still works if a watcher doesn't exist."""
+    self.mock.get_issue.return_value = self.mock_issue
+
+    # Simulate adding a watcher that doesn't exist.
+    def side_affect_func(watcher):
+      if watcher == '[email protected]':
+        raise jira.exceptions.JIRAError(
+            text=
+            'The user "[email protected]" does not have permission to view this issue. This user will not be added to the watch list.',
+            status_code=401)
+
+    self.mock_issue.ccs.add('[email protected]')
+    self.mock.client.add_watcher.side_effect = side_affect_func
+
+    issue = self.issue_tracker.get_issue('VSEC-3112')
+    issue.status = 'Closed'
+    issue.save(new_comment='test comments')
+    self.mock.client.add_comment.assert_called_with(self.mock_issue.jira_issue,
+                                                    'test comments')
+    self.assertEqual(issue.status, 'Closed')