Modified: trunk/Tools/ChangeLog (141205 => 141206)
--- trunk/Tools/ChangeLog 2013-01-30 02:43:30 UTC (rev 141205)
+++ trunk/Tools/ChangeLog 2013-01-30 03:00:50 UTC (rev 141206)
@@ -1,3 +1,23 @@
+2013-01-29 Alan Cutter <[email protected]>
+
+ Tidy up Sheriffbot's Sheriffs command's unit tests
+ https://bugs.webkit.org/show_bug.cgi?id=108262
+
+ Reviewed by Eric Seidel.
+
+ Added the use of MockWeb instead of the filesystem to test the sheriffs command.
+
+ * Scripts/webkitpy/tool/bot/irc_command.py:
+ (Sheriffs._retrieve_webkit_sheriffs):
+ (Sheriffs.execute):
+ * Scripts/webkitpy/tool/bot/irc_command_unittest.py:
+ (IRCCommandTest.test_sheriffs):
+ * Scripts/webkitpy/tool/bot/testdata/webkit_sheriff_0.js: Removed.
+ * Scripts/webkitpy/tool/bot/testdata/webkit_sheriff_1.js: Removed.
+ * Scripts/webkitpy/tool/bot/testdata/webkit_sheriff_2.js: Removed.
+ * Scripts/webkitpy/tool/bot/testdata/webkit_sheriff_malformed.js: Removed.
+ * Scripts/webkitpy/tool/bot/testdata/webkit_sheriff_zero.js: Removed.
+
2013-01-29 Lucas Forschler <[email protected]>
Enable tests for Windows EWS!
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py (141205 => 141206)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2013-01-30 02:43:30 UTC (rev 141205)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2013-01-30 03:00:50 UTC (rev 141206)
@@ -253,9 +253,9 @@
usage_string = "sheriffs"
help_string = "Retrieves who the current Chromium WebKit sheriffs are from: %s" % urls.chromium_webkit_sheriff_url
- def _retrieve_webkit_sheriffs(self, url):
+ def _retrieve_webkit_sheriffs(self, tool, url):
try:
- sheriff_js = Web().get_binary(url, True)
+ sheriff_js = tool.web.get_binary(url, True)
except:
return None
if sheriff_js == None:
@@ -274,7 +274,7 @@
else:
url = ""
- sheriffs = self._retrieve_webkit_sheriffs(url)
+ sheriffs = self._retrieve_webkit_sheriffs(tool, url)
if sheriffs == None:
return "%s: Failed to parse URL: %s" % (nick, url)
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py (141205 => 141206)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py 2013-01-30 02:43:30 UTC (rev 141205)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py 2013-01-30 03:00:50 UTC (rev 141206)
@@ -32,6 +32,7 @@
from webkitpy.common.system.outputcapture import OutputCapture
from webkitpy.tool.bot.irc_command import *
from webkitpy.tool.mocktool import MockTool
+from webkitpy.common.net.web_mock import MockWeb
from webkitpy.common.system.executive_mock import MockExecutive
@@ -65,16 +66,22 @@
def test_sheriffs(self):
sheriffs = Sheriffs()
+ tool = MockTool(web=MockWeb({
+ "test_0": "document.write('');",
+ "test_1": "document.write('test_user');",
+ "test_2": "document.write('test_user_1, test_user_2');",
+ "test_malformed": "malformed",
+ }))
self.assertEqual("tom: There are no Chromium Webkit sheriffs currently assigned.",
- sheriffs.execute("tom", [self._sheriff_test_data_url("0")], None, None))
+ sheriffs.execute("tom", ["test_0"], tool, None))
self.assertEqual("tom: The current Chromium Webkit sheriff is: test_user",
- sheriffs.execute("tom", [self._sheriff_test_data_url("1")], None, None))
+ sheriffs.execute("tom", ["test_1"], tool, None))
self.assertEqual("tom: The current Chromium Webkit sheriffs are: test_user_1, test_user_2",
- sheriffs.execute("tom", [self._sheriff_test_data_url("2")], None, None))
- self.assertEqual("tom: Failed to parse URL: " + self._sheriff_test_data_url("malformed"),
- sheriffs.execute("tom", [self._sheriff_test_data_url("malformed")], None, None))
- self.assertEqual("tom: Failed to parse URL: http://invalid/",
- sheriffs.execute("tom", ["http://invalid/"], None, None))
+ sheriffs.execute("tom", ["test_2"], tool, None))
+ self.assertEqual("tom: Failed to parse URL: test_malformed",
+ sheriffs.execute("tom", ["test_malformed"], tool, None))
+ self.assertEqual("tom: Failed to parse URL: invalid",
+ sheriffs.execute("tom", ["invalid"], tool, None))
def test_create_bug(self):
create_bug = CreateBug()
Deleted: trunk/Tools/Scripts/webkitpy/tool/bot/testdata/webkit_sheriff_2.js (141205 => 141206)
--- trunk/Tools/Scripts/webkitpy/tool/bot/testdata/webkit_sheriff_2.js 2013-01-30 02:43:30 UTC (rev 141205)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/testdata/webkit_sheriff_2.js 2013-01-30 03:00:50 UTC (rev 141206)
@@ -1 +0,0 @@
-document.write('test_user_1, test_user_2');