[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:26:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ef881782627feca409e2b0999228139da3d2e8d7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 10 22:30:29 2010 +0000
2010-12-10 Eric Seidel <eric at webkit.org>
Unreviewed.
commit-queue should report port/platform information when commenting on flaky test bugs
https://bugs.webkit.org/show_bug.cgi?id=50839
Renamed platform.py to platforminfo.py. This broke import platform in executive.py
which was only used by new run webkit tests (and clearly not unit tested).
* Scripts/webkitpy/common/system/platforminfo.py: Renamed from WebKitTools/Scripts/webkitpy/common/system/platform.py.
* Scripts/webkitpy/tool/main.py:
* Scripts/webkitpy/tool/mocktool.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73804 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 29562f4..cab6501 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,19 @@
2010-12-10 Eric Seidel <eric at webkit.org>
+ Unreviewed.
+
+ commit-queue should report port/platform information when commenting on flaky test bugs
+ https://bugs.webkit.org/show_bug.cgi?id=50839
+
+ Renamed platform.py to platforminfo.py. This broke import platform in executive.py
+ which was only used by new run webkit tests (and clearly not unit tested).
+
+ * Scripts/webkitpy/common/system/platforminfo.py: Renamed from WebKitTools/Scripts/webkitpy/common/system/platform.py.
+ * Scripts/webkitpy/tool/main.py:
+ * Scripts/webkitpy/tool/mocktool.py:
+
+2010-12-10 Eric Seidel <eric at webkit.org>
+
Reviewed by Tony Chang.
commit-queue should report port/platform information when commenting on flaky test bugs
diff --git a/WebKitTools/Scripts/webkitpy/common/system/platform.py b/WebKitTools/Scripts/webkitpy/common/system/platform.py
deleted file mode 100644
index 8139aed..0000000
--- a/WebKitTools/Scripts/webkitpy/common/system/platform.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2010 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import platform
-
-
-# We use this instead of calls to platform directly so allow mocking.
-# It's unclear if we should allow instantiation of multiple of these
-# objects (like we do Ports for rebaseline commands, etc.),
-# or if it should just be a mocking layer for python's platform.py
-class Platform(object):
-
- def display_name(self):
- return platform.platform(aliased=1, terse=1)
diff --git a/WebKitTools/Scripts/webkitpy/common/system/platforminfo.py b/WebKitTools/Scripts/webkitpy/common/system/platforminfo.py
new file mode 100644
index 0000000..1256c08
--- /dev/null
+++ b/WebKitTools/Scripts/webkitpy/common/system/platforminfo.py
@@ -0,0 +1,36 @@
+# Copyright (c) 2010 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import platform
+
+
+# We use this instead of calls to platform directly so allow mocking.
+class PlatformInfo(object):
+
+ def display_name(self):
+ return platform.platform(aliased=1, terse=1)
diff --git a/WebKitTools/Scripts/webkitpy/tool/main.py b/WebKitTools/Scripts/webkitpy/tool/main.py
index c8d0ffb..53a699b 100755
--- a/WebKitTools/Scripts/webkitpy/tool/main.py
+++ b/WebKitTools/Scripts/webkitpy/tool/main.py
@@ -41,7 +41,7 @@ from webkitpy.common.net.buildbot import BuildBot
from webkitpy.common.net.irc.ircproxy import IRCProxy
from webkitpy.common.net.statusserver import StatusServer
from webkitpy.common.system.executive import Executive
-from webkitpy.common.system.platform import Platform
+from webkitpy.common.system.platforminfo import PlatformInfo
from webkitpy.common.system.user import User
from webkitpy.layout_tests import port
from webkitpy.tool.multicommandtool import MultiCommandTool
@@ -77,7 +77,7 @@ class WebKitPatch(MultiCommandTool):
self._checkout = None
self.status_server = StatusServer()
self.port_factory = port.factory
- self.platform = Platform()
+ self.platform = PlatformInfo()
def scm(self):
# Lazily initialize SCM to not error-out before command line parsing (or when running non-scm commands).
diff --git a/WebKitTools/Scripts/webkitpy/tool/mocktool.py b/WebKitTools/Scripts/webkitpy/tool/mocktool.py
index 791ebd6..7328359 100644
--- a/WebKitTools/Scripts/webkitpy/tool/mocktool.py
+++ b/WebKitTools/Scripts/webkitpy/tool/mocktool.py
@@ -635,7 +635,7 @@ class MockPortFactory(object):
return {"test_port1": MockTestPort1(), "test_port2": MockTestPort2()}
-class MockPlatform(object):
+class MockPlatformInfo(object):
def display_name(self):
return "MockPlatform 1.0"
@@ -654,7 +654,7 @@ class MockTool(object):
self.status_server = MockStatusServer()
self.irc_password = "MOCK irc password"
self.port_factory = MockPortFactory()
- self.platform = MockPlatform()
+ self.platform = MockPlatformInfo()
def scm(self):
return self._scm
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list