Title: [90300] trunk/Tools
- Revision
- 90300
- Author
- [email protected]
- Date
- 2011-07-01 17:09:12 -0700 (Fri, 01 Jul 2011)
Log Message
2011-07-01 Adam Barth <[email protected]>
Add some more debug logging to try to understand why we're getting
stuck acquring the HTTP lock.
* Scripts/webkitpy/layout_tests/port/http_lock.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90299 => 90300)
--- trunk/Tools/ChangeLog 2011-07-02 00:05:07 UTC (rev 90299)
+++ trunk/Tools/ChangeLog 2011-07-02 00:09:12 UTC (rev 90300)
@@ -1,5 +1,12 @@
2011-07-01 Adam Barth <[email protected]>
+ Add some more debug logging to try to understand why we're getting
+ stuck acquring the HTTP lock.
+
+ * Scripts/webkitpy/layout_tests/port/http_lock.py:
+
+2011-07-01 Adam Barth <[email protected]>
+
Refactor NRWT parsing logic in master.cfg to understand that run-webkit-tests might run NRWT
https://bugs.webkit.org/show_bug.cgi?id=63854
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/http_lock.py (90299 => 90300)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/http_lock.py 2011-07-02 00:05:07 UTC (rev 90299)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/http_lock.py 2011-07-02 00:09:12 UTC (rev 90300)
@@ -87,6 +87,7 @@
it deletes the lock file."""
lock_list = self._lock_file_list()
if not lock_list:
+ _log.debug("No lock file list")
return
try:
current_lock_file = open(lock_list[0], 'r')
@@ -96,9 +97,15 @@
_log.debug("Removing stuck lock file: %s" % lock_list[0])
FileSystem().remove(lock_list[0])
return
- except (IOError, OSError):
+ except IOError, e:
+ _log.debug("IOError: %s" % e)
return
- return int(current_pid)
+ except OSError, e:
+ _log.debug("OSError: %s" % e)
+ return
+ result = int(current_pid)
+ _log.debug("Current lock pid: %s" % result)
+ return result
def _create_lock_file(self):
"""The lock files are used to schedule the running test sessions in first
@@ -121,7 +128,6 @@
self._guard_lock.release_lock()
return True
-
def wait_for_httpd_lock(self):
"""Create a lock file and wait until it's turn comes. If something goes wrong
it wont do any locking."""
@@ -131,3 +137,5 @@
while self._curent_lock_pid() != os.getpid():
time.sleep(1)
+
+ _log.debug("HTTP lock acquired")
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
