Changeset 209216 in webkit


Ignore:
Timestamp:
Dec 1, 2016 2:53:36 PM (7 years ago)
Author:
ap@apple.com
Message:

Remove webkitpy dependency on Eliza
​https://bugs.webkit.org/show_bug.cgi?id=164979

Reviewed by Daniel Bates.

This module is not on pypi, so installing it is a challenge. The jokes feel pretty old too!

  • Scripts/webkitpy/thirdparty/init.py:
  • Scripts/webkitpy/thirdparty/init_unittest.py: Changed mock import hook to

test buildbot instead of eliza.

  • Scripts/webkitpy/tool/bot/ircbot.py:
  • Scripts/webkitpy/tool/bot/ircbot_unittest.py:
Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r209192 r209216  
     12016-12-01  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Remove webkitpy dependency on Eliza
     4        https://bugs.webkit.org/show_bug.cgi?id=164979
     5
     6        Reviewed by Daniel Bates.
     7
     8        This module is not on pypi, so installing it is a challenge. The jokes feel pretty old too!
     9
     10        * Scripts/webkitpy/thirdparty/__init__.py:
     11        * Scripts/webkitpy/thirdparty/__init___unittest.py: Changed mock import hook to
     12        test buildbot instead of eliza.
     13        * Scripts/webkitpy/tool/bot/ircbot.py:
     14        * Scripts/webkitpy/tool/bot/ircbot_unittest.py:
     15
    1162016-12-01  Beth Dakin  <bdakin@apple.com>
    217

  • trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py

    r208205 r209216  
    8686        elif '.coverage' in fullname:
    8787            self._install_coverage()
    88         elif '.eliza' in fullname:
    89             self._install_eliza()
    9088        elif '.buildbot' in fullname:
    9189            self._install_buildbot()
    … …  
    148146        self._install(url="http://pypi.python.org/packages/source/c/coverage/coverage-3.5.1.tar.gz#md5=410d4c8155a4dab222f2bc51212d4a24", url_subpath="coverage-3.5.1/coverage")
    149147
    150     def _install_eliza(self):
    151         self._install(url="http://www.adambarth.com/webkit/eliza", target_name="eliza.py")
    152 
    153148    def _install_twisted_15_5_0(self):
    154149        twisted_dir = self._fs.join(_AUTOINSTALLED_DIR, "twisted_15_5_0")

  • trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py

    r198310 r209216  
    3939            def __init__(self):
    4040                AutoinstallImportHook.__init__(self)
    41                 self.eliza_installed = False
     41                self.buildbot_installed = False
    4242
    43             def _install_eliza(self):
    44                 self.eliza_installed = True
     43            def _install_buildbot(self):
     44                self.buildbot_installed = True
    4545
    4646        mock_import_hook = MockImportHook()
    … …  
    5050            sys.meta_path.append(mock_import_hook)
    5151            # unused-variable, import failures - pylint: disable-msg=W0612,E0611,F0401
    52             from webkitpy.thirdparty.autoinstalled import eliza
    53             self.assertTrue(mock_import_hook.eliza_installed)
     52            from webkitpy.thirdparty.autoinstalled import buildbot
     53            self.assertTrue(mock_import_hook.buildbot_installed)
    5454
    5555        finally:
    … …  
    6161        import webkitpy.thirdparty.autoinstalled.buildbot
    6262        import webkitpy.thirdparty.autoinstalled.coverage
    63         import webkitpy.thirdparty.autoinstalled.eliza
    6463        import webkitpy.thirdparty.autoinstalled.mechanize
    6564        import webkitpy.thirdparty.autoinstalled.pylint

  • trunk/Tools/Scripts/webkitpy/tool/bot/ircbot.py

    r124373 r209216  
    5353
    5454
    55 class Eliza(IRCCommand):
    56     therapist = None
    57 
    58     def __init__(self):
    59         if not self.therapist:
    60             import webkitpy.thirdparty.autoinstalled.eliza as eliza
    61             Eliza.therapist = eliza.eliza()
    62 
     55class UnknownCommand(IRCCommand):
    6356    def execute(self, nick, args, tool, sheriff):
    64         return "%s: %s" % (nick, self.therapist.respond(" ".join(args)))
     57        return "%s: %s" % (nick, "...")
    6558
    6659
    … …  
    8376        if not command:
    8477            # Give the peoples someone to talk with.
    85             command = Eliza
     78            command = UnknownCommand
    8679            args = tokenized_request
    8780        return (command, args)

  • trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py

    r202319 r209216  
    3535from webkitpy.tool.bot.sheriff import Sheriff
    3636from webkitpy.tool.bot.ircbot import IRCBot
    37 from webkitpy.tool.bot.ircbot import Eliza
     37from webkitpy.tool.bot.ircbot import UnknownCommand
    3838from webkitpy.tool.bot.sheriff_unittest import MockSheriffBot
    3939from webkitpy.tool.mocktool import MockTool
    … …  
    4949
    5050class IRCBotTest(unittest.TestCase):
    51     def test_eliza(self):
    52         eliza = Eliza()
    53         eliza.execute("tom", "hi", None, None)
    54         eliza.execute("tom", "bye", None, None)
    55 
    5651    def test_parse_command_and_args(self):
    5752        tool = MockTool()
    5853        bot = IRCBot("sheriffbot", tool, Sheriff(tool, MockSheriffBot()), irc_command.commands)
    59         self.assertEqual(bot._parse_command_and_args(""), (Eliza, [""]))
    60         self.assertEqual(bot._parse_command_and_args("   "), (Eliza, [""]))
     54        self.assertEqual(bot._parse_command_and_args(""), (UnknownCommand, [""]))
     55        self.assertEqual(bot._parse_command_and_args("   "), (UnknownCommand, [""]))
    6156        self.assertEqual(bot._parse_command_and_args(" hi "), (irc_command.Hi, []))
    6257        self.assertEqual(bot._parse_command_and_args(" hi there "), (irc_command.Hi, ["there"]))
Note: See TracChangeset for help on using the changeset viewer.