[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
eric at webkit.org
eric at webkit.org
Wed Dec 22 18:27:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f93fce22b43303efbdfd639fe1cc92cc53b0c66d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 11 06:47:30 2010 +0000
2010-12-10 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
commit-queue flaky test messages show cryptic version information for mac os x
https://bugs.webkit.org/show_bug.cgi?id=50864
Turns out platform.platform() returns kernel version information
which isn't helpful, and just plain confusing on Mac
(OS X 10.6.5 uses Darwin Kernel 10.5.0).
So I've updated PlatformInfo.display_name() to special case
mac. I also found a bad use of sys.platform in the process
and fixed that. (sys.platform always returns 'darwin' on mac).
* Scripts/webkitpy/common/system/platforminfo.py:
* Scripts/webkitpy/common/system/user.py:
* Scripts/webkitpy/tool/bot/flakytestreporter.py:
* Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
* Scripts/webkitpy/tool/commands/queues_unittest.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73838 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 93288fc..237b7dc 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,26 @@
2010-12-10 Eric Seidel <eric at webkit.org>
+ Reviewed by Adam Barth.
+
+ commit-queue flaky test messages show cryptic version information for mac os x
+ https://bugs.webkit.org/show_bug.cgi?id=50864
+
+ Turns out platform.platform() returns kernel version information
+ which isn't helpful, and just plain confusing on Mac
+ (OS X 10.6.5 uses Darwin Kernel 10.5.0).
+
+ So I've updated PlatformInfo.display_name() to special case
+ mac. I also found a bad use of sys.platform in the process
+ and fixed that. (sys.platform always returns 'darwin' on mac).
+
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ * Scripts/webkitpy/common/system/user.py:
+ * Scripts/webkitpy/tool/bot/flakytestreporter.py:
+ * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
+2010-12-10 Eric Seidel <eric at webkit.org>
+
Unreviewed.
Exception seen while reporting flaky test with commit-queue.
diff --git a/WebKitTools/Scripts/webkitpy/common/system/platforminfo.py b/WebKitTools/Scripts/webkitpy/common/system/platforminfo.py
index 1256c08..cc370ba 100644
--- a/WebKitTools/Scripts/webkitpy/common/system/platforminfo.py
+++ b/WebKitTools/Scripts/webkitpy/common/system/platforminfo.py
@@ -29,8 +29,15 @@
import platform
-# We use this instead of calls to platform directly so allow mocking.
+# We use this instead of calls to platform directly to allow mocking.
class PlatformInfo(object):
def display_name(self):
- return platform.platform(aliased=1, terse=1)
+ # platform.platform() returns Darwin information for Mac, which is just confusing.
+ if platform.system() == "Darwin":
+ return "Mac OS X %s" % platform.mac_ver()[0]
+
+ # Returns strings like:
+ # Linux-2.6.18-194.3.1.el5-i686-with-redhat-5.5-Final
+ # Windows-2008ServerR2-6.1.7600
+ return platform.platform()
diff --git a/WebKitTools/Scripts/webkitpy/common/system/user.py b/WebKitTools/Scripts/webkitpy/common/system/user.py
index 8917137..b79536c 100644
--- a/WebKitTools/Scripts/webkitpy/common/system/user.py
+++ b/WebKitTools/Scripts/webkitpy/common/system/user.py
@@ -46,7 +46,7 @@ except ImportError:
_log.warn("Unable to import readline.")
# FIXME: We could give instructions for non-mac platforms.
# Lack of readline results in a very bad user experiance.
- if sys.platform == "mac":
+ if sys.platform == "darwin":
_log.warn("If you're using MacPorts, try running:")
_log.warn(" sudo port install py25-readline")
diff --git a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py
index 58be5b2..fab0010 100644
--- a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py
+++ b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter.py
@@ -104,8 +104,8 @@ If you would like to track this test fix with another bug, please close this bug
def _bot_information(self):
bot_id = self._tool.status_server.bot_id
- bot_id_string = "Bot Id: %s " % (bot_id) if bot_id else ""
- return "%sPort: %s OS: %s" % (bot_id_string, self._tool.port().name(), self._tool.platform.display_name())
+ bot_id_string = "Bot: %s " % (bot_id) if bot_id else ""
+ return "%sPort: %s Platform: %s" % (bot_id_string, self._tool.port().name(), self._tool.platform.display_name())
def _latest_flake_message(self, flaky_test, patch):
flake_message = "The %s just saw %s flake while processing attachment %s on bug %s." % (self._bot_name, flaky_test, patch.id(), patch.bug_id())
diff --git a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
index dcfd3fe..3aafe13 100644
--- a/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
@@ -89,7 +89,7 @@ If you would like to track this test fix with another bug, please close this bug
tool = MockTool()
tool.status_server = MockStatusServer("MockBotId")
reporter = FlakyTestReporter(tool, 'dummy-queue')
- self.assertEqual(reporter._bot_information(), "Bot Id: MockBotId Port: MockPort OS: MockPlatform 1.0")
+ self.assertEqual(reporter._bot_information(), "Bot: MockBotId Port: MockPort Platform: MockPlatform 1.0")
def test_create_bug_for_flaky_test(self):
tool = MockTool()
@@ -105,7 +105,7 @@ foo/bar.html was authored by abarth at webkit.org.
http://trac.webkit.org/browser/trunk/LayoutTests/foo/bar.html
The dummy-queue just saw foo/bar.html flake while processing attachment 197 on bug 42.
-Port: MockPort OS: MockPlatform 1.0
+Port: MockPort Platform: MockPlatform 1.0
The bots will update this with information from each new failure.
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
index 4b00668..4e3a793 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues_unittest.py
@@ -327,13 +327,13 @@ MOCK: release_work_item: commit-queue 197
expected_stderr = """MOCK bug comment: bug_id=76, cc=None
--- Begin comment ---
The commit-queue just saw foo/bar.html flake while processing attachment 197 on bug 42.
-Port: MockPort OS: MockPlatform 1.0
+Port: MockPort Platform: MockPlatform 1.0
--- End comment ---
MOCK bug comment: bug_id=76, cc=None
--- Begin comment ---
The commit-queue just saw bar/baz.html flake while processing attachment 197 on bug 42.
-Port: MockPort OS: MockPlatform 1.0
+Port: MockPort Platform: MockPlatform 1.0
--- End comment ---
MOCK bug comment: bug_id=42, cc=None
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list