Diff
Modified: trunk/Tools/ChangeLog (209215 => 209216)
--- trunk/Tools/ChangeLog 2016-12-01 22:48:55 UTC (rev 209215)
+++ trunk/Tools/ChangeLog 2016-12-01 22:53:36 UTC (rev 209216)
@@ -1,3 +1,18 @@
+2016-12-01 Alexey Proskuryakov <a...@apple.com>
+
+ 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:
+
2016-12-01 Beth Dakin <bda...@apple.com>
Force clicking tests fail on some machines
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (209215 => 209216)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2016-12-01 22:48:55 UTC (rev 209215)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2016-12-01 22:53:36 UTC (rev 209216)
@@ -85,8 +85,6 @@
self._install_pylint()
elif '.coverage' in fullname:
self._install_coverage()
- elif '.eliza' in fullname:
- self._install_eliza()
elif '.buildbot' in fullname:
self._install_buildbot()
elif '.keyring' in fullname:
@@ -147,9 +145,6 @@
self._ensure_autoinstalled_dir_is_in_sys_path()
self._install(url="" url_subpath="coverage-3.5.1/coverage")
- def _install_eliza(self):
- self._install(url="" target_name="eliza.py")
-
def _install_twisted_15_5_0(self):
twisted_dir = self._fs.join(_AUTOINSTALLED_DIR, "twisted_15_5_0")
installer = AutoInstaller(prepend_to_search_path=True, target_dir=twisted_dir)
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py (209215 => 209216)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py 2016-12-01 22:48:55 UTC (rev 209215)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py 2016-12-01 22:53:36 UTC (rev 209216)
@@ -38,10 +38,10 @@
class MockImportHook(AutoinstallImportHook):
def __init__(self):
AutoinstallImportHook.__init__(self)
- self.eliza_installed = False
+ self.buildbot_installed = False
- def _install_eliza(self):
- self.eliza_installed = True
+ def _install_buildbot(self):
+ self.buildbot_installed = True
mock_import_hook = MockImportHook()
try:
@@ -49,8 +49,8 @@
# so these modules will get installed before MockImportHook runs.
sys.meta_path.append(mock_import_hook)
# unused-variable, import failures - pylint: disable-msg=W0612,E0611,F0401
- from webkitpy.thirdparty.autoinstalled import eliza
- self.assertTrue(mock_import_hook.eliza_installed)
+ from webkitpy.thirdparty.autoinstalled import buildbot
+ self.assertTrue(mock_import_hook.buildbot_installed)
finally:
sys.meta_path.remove(mock_import_hook)
@@ -60,7 +60,6 @@
# unused-variable, import failures - pylint: disable-msg=W0612,E0611,F0401
import webkitpy.thirdparty.autoinstalled.buildbot
import webkitpy.thirdparty.autoinstalled.coverage
- import webkitpy.thirdparty.autoinstalled.eliza
import webkitpy.thirdparty.autoinstalled.mechanize
import webkitpy.thirdparty.autoinstalled.pylint
import webkitpy.thirdparty.autoinstalled.pep8
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/ircbot.py (209215 => 209216)
--- trunk/Tools/Scripts/webkitpy/tool/bot/ircbot.py 2016-12-01 22:48:55 UTC (rev 209215)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/ircbot.py 2016-12-01 22:53:36 UTC (rev 209216)
@@ -52,16 +52,9 @@
return self._password
-class Eliza(IRCCommand):
- therapist = None
-
- def __init__(self):
- if not self.therapist:
- import webkitpy.thirdparty.autoinstalled.eliza as eliza
- Eliza.therapist = eliza.eliza()
-
+class UnknownCommand(IRCCommand):
def execute(self, nick, args, tool, sheriff):
- return "%s: %s" % (nick, self.therapist.respond(" ".join(args)))
+ return "%s: %s" % (nick, "...")
class IRCBot(object):
@@ -82,7 +75,7 @@
args = tokenized_request[1:]
if not command:
# Give the peoples someone to talk with.
- command = Eliza
+ command = UnknownCommand
args = tokenized_request
return (command, args)
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py (209215 => 209216)
--- trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2016-12-01 22:48:55 UTC (rev 209215)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2016-12-01 22:53:36 UTC (rev 209216)
@@ -34,7 +34,7 @@
from webkitpy.tool.bot.queueengine import TerminateQueue
from webkitpy.tool.bot.sheriff import Sheriff
from webkitpy.tool.bot.ircbot import IRCBot
-from webkitpy.tool.bot.ircbot import Eliza
+from webkitpy.tool.bot.ircbot import UnknownCommand
from webkitpy.tool.bot.sheriff_unittest import MockSheriffBot
from webkitpy.tool.mocktool import MockTool
@@ -48,16 +48,11 @@
class IRCBotTest(unittest.TestCase):
- def test_eliza(self):
- eliza = Eliza()
- eliza.execute("tom", "hi", None, None)
- eliza.execute("tom", "bye", None, None)
-
def test_parse_command_and_args(self):
tool = MockTool()
bot = IRCBot("sheriffbot", tool, Sheriff(tool, MockSheriffBot()), irc_command.commands)
- self.assertEqual(bot._parse_command_and_args(""), (Eliza, [""]))
- self.assertEqual(bot._parse_command_and_args(" "), (Eliza, [""]))
+ self.assertEqual(bot._parse_command_and_args(""), (UnknownCommand, [""]))
+ self.assertEqual(bot._parse_command_and_args(" "), (UnknownCommand, [""]))
self.assertEqual(bot._parse_command_and_args(" hi "), (irc_command.Hi, []))
self.assertEqual(bot._parse_command_and_args(" hi there "), (irc_command.Hi, ["there"]))
