Title: [198310] trunk/Tools
- Revision
- 198310
- Author
- [email protected]
- Date
- 2016-03-16 17:13:30 -0700 (Wed, 16 Mar 2016)
Log Message
Unreviewed, rolling out r198187.
https://bugs.webkit.org/show_bug.cgi?id=155564
Potentially break testing on iOS (Requested by Guest23 on
#webkit).
Reverted changeset:
"Add twisted-15.5.0 module to
webkitpy.thirdparty.autoinstalled."
https://bugs.webkit.org/show_bug.cgi?id=154667
http://trac.webkit.org/changeset/198187
Patch by Commit Queue <[email protected]> on 2016-03-16
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (198309 => 198310)
--- trunk/Tools/ChangeLog 2016-03-17 00:07:58 UTC (rev 198309)
+++ trunk/Tools/ChangeLog 2016-03-17 00:13:30 UTC (rev 198310)
@@ -1,3 +1,18 @@
+2016-03-16 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r198187.
+ https://bugs.webkit.org/show_bug.cgi?id=155564
+
+ Potentially break testing on iOS (Requested by Guest23 on
+ #webkit).
+
+ Reverted changeset:
+
+ "Add twisted-15.5.0 module to
+ webkitpy.thirdparty.autoinstalled."
+ https://bugs.webkit.org/show_bug.cgi?id=154667
+ http://trac.webkit.org/changeset/198187
+
2016-03-16 David Kilzer <[email protected]>
check-webkit-style: should warn about blank lines after #include "config.h" in TestWebKitAPI
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py (198309 => 198310)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2016-03-17 00:07:58 UTC (rev 198309)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2016-03-17 00:13:30 UTC (rev 198310)
@@ -9,7 +9,7 @@
import twisted
except ImportError:
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../..')))
- from webkitpy.thirdparty.autoinstalled.twisted_15_5_0 import twisted
+ from webkitpy.thirdparty.autoinstalled.twisted import twisted
from twisted.web import static, server
from twisted.web.resource import Resource
@@ -29,6 +29,7 @@
_log.info("Serving request %s" % request)
sys.stdout.write(request.content.getvalue())
sys.stdout.flush()
+ reactor.stop()
return 'OK'
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (198309 => 198310)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2016-03-17 00:07:58 UTC (rev 198309)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2016-03-17 00:13:30 UTC (rev 198310)
@@ -91,8 +91,6 @@
self._install_buildbot()
elif '.keyring' in fullname:
self._install_keyring()
- elif '.twisted_15_5_0' in fullname:
- self._install_twisted_15_5_0()
elif '.twisted' in fullname:
self._install_twisted()
@@ -157,11 +155,6 @@
installer = AutoInstaller(prepend_to_search_path=True, target_dir=twisted_dir)
installer.install(url="" url_subpath="Twisted-12.1.0/twisted")
- 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)
- installer.install(url="" url_subpath="Twisted-15.5.0/twisted")
-
def _install(self, url, url_subpath=None, target_name=None):
installer = AutoInstaller(target_dir=_AUTOINSTALLED_DIR)
installer.install(url="" url_subpath=url_subpath, target_name=target_name)
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py (198309 => 198310)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py 2016-03-17 00:07:58 UTC (rev 198309)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py 2016-03-17 00:13:30 UTC (rev 198310)
@@ -64,5 +64,3 @@
import webkitpy.thirdparty.autoinstalled.mechanize
import webkitpy.thirdparty.autoinstalled.pylint
import webkitpy.thirdparty.autoinstalled.pep8
- import webkitpy.thirdparty.autoinstalled.twisted
- import webkitpy.thirdparty.autoinstalled.twisted_15_5_0
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
