Merge pull request #252 from rust-lang/rip-irc

Remove IRC support

Author: pietroalbini

highfive/irc.py

@@ -10,8 +10,6 @@
 from copy import deepcopy
 from io import StringIO
 
-from highfive import irc
-
 # Maximum per page is 100. Sorted by number of commits, so most of the time the
 # contributor will happen early,
 post_comment_url = "https://api.github.com/repos/%s/%s/issues/%s/comments"
@@ -117,12 +115,6 @@ def set_assignee(self, assignee, owner, repo, issue, user, author, to_mention):
             else:
                 raise e
 
-        if assignee:
-            irc_name_of_reviewer = self.get_irc_nick(assignee)
-            if irc_name_of_reviewer:
-                client = irc.IrcClient(target="#rust-bots")
-                client.send_then_quit("{}: ping to review issue https://www.github.com/{}/{}/pull/{} by {}."
-                                      .format(irc_name_of_reviewer, owner, repo, issue, author))
         self.run_commands(to_mention, owner, repo, issue, user)
 
     def run_commands(self, to_mention, owner, repo, issue, user):
@@ -148,22 +140,6 @@ def run_commands(self, to_mention, owner, repo, issue, user):
             if len(message) > 0:
                 self.post_comment(message, owner, repo, issue)
 
-    def get_irc_nick(self, gh_name):
-        """ returns None if the request status code is not 200,
-         if the user does not exist on the rustacean database,
-         or if the user has no `irc` field associated with their username
-        """
-        try:
-            data = urllib.request.urlopen(rustaceans_api_url.format(username=gh_name))
-            if data.getcode() == 200:
-                rustacean_data = json.loads(data.read())
-                if rustacean_data:
-                    return rustacean_data[0].get("irc")
-        except urllib.error.HTTPError:
-            pass
-
-        return None
-
     def is_collaborator(self, commenter, owner, repo):
         """Returns True if `commenter` is a collaborator in the repo."""
         try:

highfive/newpr.py

@@ -62,13 +62,10 @@ class TestNewPr(object):
     @pytest.fixture(autouse=True)
     def make_mocks(cls, patcherize):
         cls.mocks = patcherize((
-            ('get_irc_nick', 'highfive.newpr.HighfiveHandler.get_irc_nick'),
             ('ConfigParser', 'highfive.newpr.ConfigParser'),
             ('load_json_file', 'highfive.newpr.HighfiveHandler._load_json_file'),
         ))
 
-        cls.mocks['get_irc_nick'].return_value = None
-
         cls.mocks['load_json_file'].side_effect = (
             fakes.get_repo_configs()['individuals_no_dirs'],
             fakes.get_global_configs()['base'],
@@ -255,12 +252,9 @@ class TestNewComment(object):
     @pytest.fixture(autouse=True)
     def make_mocks(cls, patcherize):
         cls.mocks = patcherize((
-            ('get_irc_nick', 'highfive.newpr.HighfiveHandler.get_irc_nick'),
             ('ConfigParser', 'highfive.newpr.ConfigParser'),
         ))
 
-        cls.mocks['get_irc_nick'].return_value = None
-
         config_mock = mock.Mock()
         config_mock.get.side_effect = ('integration-user', 'integration-token')
         cls.mocks['ConfigParser'].RawConfigParser.return_value = config_mock

highfive/tests/test_integration_tests.py

@@ -346,57 +346,6 @@ def test_find_reviewer(self):
             assert handler.find_reviewer(msg) is None, \
                 "expected '%s' to have no reviewer extracted" % msg
 
-    def setup_get_irc_nick_mocks(self, mock_urllib, status_code, data=None):
-        if status_code != 200:
-            mock_urllib.side_effect = HTTPError(
-                None, status_code, None, None, None
-            )
-            return
-
-        mock_data = mock.Mock()
-        mock_data.getcode.return_value = status_code
-        mock_data.read.return_value = data
-        mock_urllib.request.urlopen.return_value = mock_data
-        return mock_data
-
-    @mock.patch('highfive.newpr.urllib')
-    def test_get_irc_nick_non_200(self, mock_urllib):
-        handler = HighfiveHandlerMock(Payload({})).handler
-        self.setup_get_irc_nick_mocks(mock_urllib, 503)
-        assert handler.get_irc_nick('foo') is None
-
-        mock_urllib.request.urlopen.assert_called_with(
-            'http://www.ncameron.org/rustaceans/user?username=foo'
-        )
-
-    @mock.patch('highfive.newpr.urllib')
-    def test_get_irc_nick_no_data(self, mock_urllib):
-        handler = HighfiveHandlerMock(Payload({})).handler
-        mock_data = self.setup_get_irc_nick_mocks(mock_urllib, 200, '[]')
-        assert handler.get_irc_nick('foo') is None
-
-        mock_urllib.request.urlopen.assert_called_with(
-            'http://www.ncameron.org/rustaceans/user?username=foo'
-        )
-        mock_data.getcode.assert_called()
-        mock_data.read.assert_called()
-
-    @mock.patch('highfive.newpr.urllib')
-    def test_get_irc_nick_has_data(self, mock_urllib):
-        handler = HighfiveHandlerMock(Payload({})).handler
-        mock_data = self.setup_get_irc_nick_mocks(
-            mock_urllib, 200,
-            '[{"username":"nrc","name":"Nick Cameron","irc":"nrc","email":"[email protected]","discourse":"nrc","reddit":"nick29581","twitter":"@nick_r_cameron","blog":"https://www.ncameron.org/blog","website":"https://www.ncameron.org","notes":"<p>I work on the Rust compiler, language design, and tooling. I lead the dev tools team and am part of the core team. I&#39;m part of the research team at Mozilla.</p>\\n","avatar":"https://avatars.githubusercontent.com/nrc","irc_channels":["rust-dev-tools","rust","rust-internals","rust-lang","rustc","servo"]}]'
-        )
-        assert handler.get_irc_nick('nrc') == 'nrc'
-
-        mock_urllib.request.urlopen.assert_called_with(
-            'http://www.ncameron.org/rustaceans/user?username=nrc'
-        )
-        mock_data.getcode.assert_called()
-        mock_data.read.assert_called()
-
-
 class TestApiReq(TestNewPR):
     @pytest.fixture(autouse=True)
     def make_defaults(cls, patcherize):
@@ -537,13 +486,9 @@ class TestSetAssignee(TestNewPR):
     def make_defaults(cls, patcherize):
         cls.mocks = patcherize((
             ('api_req', 'highfive.newpr.HighfiveHandler.api_req'),
-            ('get_irc_nick', 'highfive.newpr.HighfiveHandler.get_irc_nick'),
             ('post_comment', 'highfive.newpr.HighfiveHandler.post_comment'),
-            ('IrcClient', 'highfive.irc.IrcClient'),
         ))
 
-        cls.mocks['client'] = cls.mocks['IrcClient'].return_value
-
         cls.handler = HighfiveHandlerMock(Payload({})).handler
         cls.assignee = 'assigneeUser'
         cls.author = 'authorUser'
@@ -570,24 +515,16 @@ def assert_api_req_call(self, assignee=''):
         )
 
     def test_api_req_good(self):
-        self.mocks['get_irc_nick'].return_value = None
         self.set_assignee()
 
         self.assert_api_req_call()
-        self.mocks['get_irc_nick'].assert_called_once_with(self.assignee)
-        self.mocks['IrcClient'].assert_not_called()
-        self.mocks['client'].send_then_quit.assert_not_called()
         self.mocks['post_comment'].assert_not_called()
 
     def test_api_req_201(self):
         self.mocks['api_req'].side_effect = HTTPError(None, 201, None, None, None)
-        self.mocks['get_irc_nick'].return_value = None
         self.set_assignee()
 
         self.assert_api_req_call()
-        self.mocks['get_irc_nick'].assert_called_once_with(self.assignee)
-        self.mocks['IrcClient'].assert_not_called()
-        self.mocks['client'].send_then_quit.assert_not_called()
         self.mocks['post_comment'].assert_not_called()
 
     def test_api_req_error(self):
@@ -596,30 +533,15 @@ def test_api_req_error(self):
             self.set_assignee()
 
         self.assert_api_req_call()
-        self.mocks['get_irc_nick'].assert_not_called()
-        self.mocks['IrcClient'].assert_not_called()
-        self.mocks['client'].send_then_quit.assert_not_called()
         self.mocks['post_comment'].assert_not_called()
 
     def test_has_nick(self):
-        irc_nick = 'nick'
-        self.mocks['get_irc_nick'].return_value = irc_nick
-
         self.set_assignee()
 
         self.assert_api_req_call()
-        self.mocks['get_irc_nick'].assert_called_once_with(self.assignee)
-        self.mocks['IrcClient'].assert_called_once_with(target='#rust-bots')
-        self.mocks['client'].send_then_quit.assert_called_once_with(
-            "{}: ping to review issue https://www.github.com/{}/{}/pull/{} by {}.".format(
-                irc_nick, self.owner, self.repo, self.issue, self.author
-            )
-        )
         self.mocks['post_comment'].assert_not_called()
 
     def test_has_to_mention(self):
-        self.mocks['get_irc_nick'].return_value = None
-
         to_mention = [
             {
                 'message': 'This is important',
@@ -633,9 +555,6 @@ def test_has_to_mention(self):
         self.set_assignee(to_mention=to_mention)
 
         self.assert_api_req_call()
-        self.mocks['get_irc_nick'].assert_called_once_with(self.assignee)
-        self.mocks['IrcClient'].assert_not_called()
-        self.mocks['client'].send_then_quit.assert_not_called()
         self.mocks['post_comment'].assert_called_once_with(
             'This is important\n\ncc @userA,@userB,@userC\n\nAlso important\n\ncc @userD',
             self.owner, self.repo, self.issue
@@ -645,9 +564,6 @@ def test_no_assignee(self):
         self.set_assignee(None)
 
         self.assert_api_req_call(None)
-        self.mocks['get_irc_nick'].assert_not_called()
-        self.mocks['IrcClient'].assert_not_called()
-        self.mocks['client'].send_then_quit.assert_not_called()
         self.mocks['post_comment'].assert_not_called()