Bug 64885 – Move HttpLock to using a FileSystem object

• Component: New Bugs
• Status: RESOLVED FIXED

[Eric Seidel (no email)]

Move HttpLock to using a FileSystem object

[Eric Seidel (no email)]

Created attachment 101498 [details]
Patch

[WebKit Review Bot]

Comment on attachment 101498 [details]
Patch

Clearing flags on attachment: 101498

Committed r91398: <http://trac.webkit.org/changeset/91398>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.

[Stephen White]

(In reply to comment #3)
> All reviewed patches have been landed.  Closing bug.

The Chrome WebKit Linux canaries seem to be unhappy with this change:

2011-07-20 13:54:27,112 10770 http_lock.py:117 DEBUG Creating lock file: /tmp/WebKitHttpd.lock.0
Traceback (most recent call last):
  File "/mnt/data/b/build/slave/Webkit_Linux_32/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 436, in <module>
    sys.exit(main())
  File "/mnt/data/b/build/slave/Webkit_Linux_32/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 431, in main
    return run(port, options, args)
  File "/mnt/data/b/build/slave/Webkit_Linux_32/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 107, in run
    num_unexpected_results = manager.run(result_summary)
  File "/mnt/data/b/build/slave/Webkit_Linux_32/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 873, in run
    interrupted, keyboard_interrupted, thread_timings, test_timings, individual_test_timings = self._run_tests(self._test_files_list, result_summary)
  File "/mnt/data/b/build/slave/Webkit_Linux_32/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 730, in _run_tests
    self.start_servers_with_lock()
  File "/mnt/data/b/build/slave/Webkit_Linux_32/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 927, in start_servers_with_lock
    self._port.acquire_http_lock()
  File "/mnt/data/b/build/slave/Webkit_Linux_32/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py", line 715, in acquire_http_lock
    self._http_lock.wait_for_httpd_lock()
  File "/mnt/data/b/build/slave/Webkit_Linux_32/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/http_lock.py", line 129, in wait_for_httpd_lock
    while self._curent_lock_pid() != os.getpid():
  File "/mnt/data/b/build/slave/Webkit_Linux_32/build/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/http_lock.py", line 92, in _curent_lock_pid
    if not (current_pid and self._executive.check_running_pid(int(current_pid))):
NameError: global name 'current_pid' is not defined

http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Linux%2032/builds/3079/steps/webkit_tests/logs/stdio

[Eric Seidel (no email)]

Fixing.

[Eric Seidel (no email)]

Created attachment 101517 [details]
Patch

[Eric Seidel (no email)]

Reopening to fix.

[Eric Seidel (no email)]

Comment on attachment 101517 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=101517&action=review

> Tools/Scripts/webkitpy/layout_tests/port/http_lock.py:92
> -            current_lock_file = self._filesystem.read_text_file(lock_list[0])
> +            current_pid = self._filesystem.read_text_file(lock_list[0])

This is the fix, btw.

[Eric Seidel (no email)]

Committed r91411: <http://trac.webkit.org/changeset/91411>