Bug 142083

Created attachment 247508 [details] Patch

The patch removes all the files under _certs and adds the whole _certs directory to .gitignore When runing the test after this patch, the test creates again the certificates and passes as expected, but since the files are not longer tracked and are also ignored on .gitignore they not longer appear as uncommitted/modified files to git.

(In reply to comment #2) > The patch removes all the files under _certs and adds the whole _certs > directory to .gitignore > > > When runing the test after this patch, the test creates again the > certificates and passes as expected, but since the files are not longer > tracked and are also ignored on .gitignore they not longer appear as > uncommitted/modified files to git. The certificates were originally checked in the repo to ensure repeatability of the tests. I am not sure why they were regenerated. At this time, removing them and ignoring them may be just fine. It might be slightly better to generate them in WebKitBuild/.../layout-test-results. This may be done by updating the field ssl.open_ssl.base_path (see LayoutTests/imported/w3c/resources/config.json) when starting the WPT server. This can be added in the future if that proves to be useful.

> It might be slightly better to generate them in > WebKitBuild/.../layout-test-results. This may be done by updating the field > ssl.open_ssl.base_path (see LayoutTests/imported/w3c/resources/config.json) > when starting the WPT server. > This can be added in the future if that proves to be useful. This could be done with a few lines of code as follows: diff --git a/LayoutTests/imported/w3c/resources/config.json b/LayoutTests/imported/w3c/resources/config.json index ce30f1f..2678782 100644 --- a/LayoutTests/imported/w3c/resources/config.json +++ b/LayoutTests/imported/w3c/resources/config.json @@ -9,7 +9,7 @@ "encrypt_after_connect": false, "openssl": { "openssl_binary": "openssl", - "base_path": "_certs", + "base_path": "%CERTS_DIR%", "force_regenerate": false }, "pregenerated": { diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py b/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py index 332c3c3..4445121 100755 --- a/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py +++ b/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py @@ -96,7 +96,8 @@ class WebPlatformTestServer(http_server_base.HttpServerBase): _log.debug('Copying WebKit web platform server config.json') config_wk_filename = self._filesystem.join(self._layout_root, "imported", "w3c", "resources", "config.json") if self._filesystem.isfile(config_wk_filename): - self._filesystem.copyfile(config_wk_filename, self._filesystem.join(self._doc_root, "config.json")) + config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._output_dir, "wpt_certs")) + self._filesystem.write_text_file(self._filesystem.join(self._doc_root, "config.json"), config_json) def _clean_webkit_test_files(self): _log.debug('Cleaning WPT resources files')

> It might be slightly better to generate them in > WebKitBuild/.../layout-test-results. This may be done by updating the field > ssl.open_ssl.base_path (see LayoutTests/imported/w3c/resources/config.json) > when starting the WPT server. > This can be added in the future if that proves to be useful. This could be done with a few lines of code: diff --git a/LayoutTests/imported/w3c/resources/config.json b/LayoutTests/imported/w3c/resources/config.json index ce30f1f..2678782 100644 --- a/LayoutTests/imported/w3c/resources/config.json +++ b/LayoutTests/imported/w3c/resources/config.json @@ -9,7 +9,7 @@ "encrypt_after_connect": false, "openssl": { "openssl_binary": "openssl", - "base_path": "_certs", + "base_path": "%CERTS_DIR%", "force_regenerate": false }, "pregenerated": { diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py b/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py index 332c3c3..4445121 100755 --- a/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py +++ b/Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py @@ -96,7 +96,8 @@ class WebPlatformTestServer(http_server_base.HttpServerBase): _log.debug('Copying WebKit web platform server config.json') config_wk_filename = self._filesystem.join(self._layout_root, "imported", "w3c", "resources", "config.json") if self._filesystem.isfile(config_wk_filename): - self._filesystem.copyfile(config_wk_filename, self._filesystem.join(self._doc_root, "config.json")) + config_json = self._filesystem.read_text_file(config_wk_filename).replace("%CERTS_DIR%", self._filesystem.join(self._output_dir, "wpt_certs")) + self._filesystem.write_text_file(self._filesystem.join(self._doc_root, "config.json"), config_json) def _clean_webkit_test_files(self): _log.debug('Cleaning WPT resources files')

*** Bug 142136 has been marked as a duplicate of this bug. ***

(In reply to comment #5) > > It might be slightly better to generate them in > > WebKitBuild/.../layout-test-results. This may be done by updating the field > > ssl.open_ssl.base_path (see LayoutTests/imported/w3c/resources/config.json) > > when starting the WPT server. > > This can be added in the future if that proves to be useful. > > This could be done with a few lines of code: I think we should do this rather than just attachment 247508 [details].

(In reply to comment #7) > (In reply to comment #5) > > > It might be slightly better to generate them in > > > WebKitBuild/.../layout-test-results. This may be done by updating the field > > > ssl.open_ssl.base_path (see LayoutTests/imported/w3c/resources/config.json) > > > when starting the WPT server. > > > This can be added in the future if that proves to be useful. > > > > This could be done with a few lines of code: > > I think we should do this rather than just attachment 247508 [details]. Maybe r+/cq+ this patch asap to make developers repo clean. I can then quickly submit a patch to migrate the certificates location.

After a conversation on the IRC, re-assigning to yoenn as I don't have time at this moment for this bug and seems that yoenn already has the right patch in the works to fix this.

(In reply to comment #9) > After a conversation on the IRC, re-assigning to yoenn as I don't have time > at this moment for this bug and seems that yoenn already has the right patch > in the works to fix this. sorry: s/yoenn/youenn/ regards.

Created attachment 247755 [details] Moving _certs location to layout-test-results folder

Comment on attachment 247755 [details] Moving _certs location to layout-test-results folder View in context: https://bugs.webkit.org/attachment.cgi?id=247755&action=review > Tools/ChangeLog:3 > + Layout tests imported/w3c/web-platform-tests certificates should not be tracked on the VCS (git) WebKit's VCS is actually svn.

Created attachment 248049 [details] Patch for landing

Comment on attachment 248049 [details] Patch for landing Rejecting attachment 248049 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 248049, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: tests/_certs/serial is not empty after patch, as expected 1 out of 1 hunk FAILED -- saving rejects to file LayoutTests/imported/w3c/web-platform-tests/_certs/serial.rej rm 'LayoutTests/imported/w3c/web-platform-tests/_certs/serial' patching file LayoutTests/imported/w3c/web-platform-tests/_certs/serial.old rm 'LayoutTests/imported/w3c/web-platform-tests/_certs/serial.old' Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/5942501508644864

Created attachment 248053 [details] Patch for landing

Comment on attachment 248053 [details] Patch for landing Clearing flags on attachment: 248053 Committed r181146: <http://trac.webkit.org/changeset/181146>

All reviewed patches have been landed. Closing bug.

(In reply to comment #16) > Comment on attachment 248053 [details] > Patch for landing > > Clearing flags on attachment: 248053 > > Committed r181146: <http://trac.webkit.org/changeset/181146> The bots weren't happen since I think these files were modified locally, and now they're being removed (see also Bug 141946, Comment #23): $ svn stat . A + C LayoutTests/imported/w3c/web-platform-tests/_certs > local edit, incoming delete upon update C + LayoutTests/imported/w3c/web-platform-tests/_certs/01.pem C + LayoutTests/imported/w3c/web-platform-tests/_certs/02.pem C + LayoutTests/imported/w3c/web-platform-tests/_certs/cacert.pem C + LayoutTests/imported/w3c/web-platform-tests/_certs/cakey.pem C + LayoutTests/imported/w3c/web-platform-tests/_certs/index.txt.old C + LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.key C + LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.pem D C LayoutTests/imported/w3c/web-platform-tests/tools/scripts/__init__.py > local unversioned, incoming add upon update D C LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/__init__.py > local unversioned, incoming add upon update D C Tools/Scripts/webkitpy/thirdparty/irc > local unversioned, incoming add upon update D Tools/Scripts/webkitpy/thirdparty/irc/__init__.py D Tools/Scripts/webkitpy/thirdparty/irc/ircbot.py D Tools/Scripts/webkitpy/thirdparty/irc/irclib.py ? layout-test-results.zip Summary of conflicts: Text conflicts: 7 Tree conflicts: 4

(In reply to comment #18) > (In reply to comment #16) > > Comment on attachment 248053 [details] > > Patch for landing > > > > Clearing flags on attachment: 248053 > > > > Committed r181146: <http://trac.webkit.org/changeset/181146> > > The bots weren't happen since I think these files were modified locally, and > now they're being removed (see also Bug 141946, Comment #23): > > $ svn stat . > A + C LayoutTests/imported/w3c/web-platform-tests/_certs > > local edit, incoming delete upon update > C + LayoutTests/imported/w3c/web-platform-tests/_certs/01.pem > C + LayoutTests/imported/w3c/web-platform-tests/_certs/02.pem > C + LayoutTests/imported/w3c/web-platform-tests/_certs/cacert.pem > C + LayoutTests/imported/w3c/web-platform-tests/_certs/cakey.pem > C + LayoutTests/imported/w3c/web-platform-tests/_certs/index.txt.old > C + LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.key > C + LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.pem > D C LayoutTests/imported/w3c/web-platform-tests/tools/scripts/__init__.py > > local unversioned, incoming add upon update > D C > LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/ > __init__.py > > local unversioned, incoming add upon update > D C Tools/Scripts/webkitpy/thirdparty/irc > > local unversioned, incoming add upon update > D Tools/Scripts/webkitpy/thirdparty/irc/__init__.py > D Tools/Scripts/webkitpy/thirdparty/irc/ircbot.py > D Tools/Scripts/webkitpy/thirdparty/irc/irclib.py > ? layout-test-results.zip > Summary of conflicts: > Text conflicts: 7 > Tree conflicts: 4 To clean this up on one bot, I used: $ svn revert --recursive LayoutTests/imported/w3c/web-platform-tests Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/01.pem' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/02.pem' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/cacert.pem' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/cakey.pem' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/index.txt.attr' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/index.txt.attr.old' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/index.txt.old' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.key' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.pem' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/serial' Reverted 'LayoutTests/imported/w3c/web-platform-tests/_certs/serial.old' Reverted 'LayoutTests/imported/w3c/web-platform-tests/tools/scripts/__init__.py' Reverted 'LayoutTests/imported/w3c/web-platform-tests/tools/webdriver/webdriver/__init__.py' $ svn stat . ? LayoutTests/imported/w3c/web-platform-tests/_certs D C Tools/Scripts/webkitpy/thirdparty/irc > local unversioned, incoming add upon update D Tools/Scripts/webkitpy/thirdparty/irc/__init__.py D Tools/Scripts/webkitpy/thirdparty/irc/ircbot.py D Tools/Scripts/webkitpy/thirdparty/irc/irclib.py ? layout-test-results.zip ? local Summary of conflicts: Tree conflicts: 1 However, that leaves the empty _certs directory, so then we have to delete that: $ rm -rf LayoutTests/imported/w3c/web-platform-tests/_certs $ svn stat . D C Tools/Scripts/webkitpy/thirdparty/irc > local unversioned, incoming add upon update D Tools/Scripts/webkitpy/thirdparty/irc/__init__.py D Tools/Scripts/webkitpy/thirdparty/irc/ircbot.py D Tools/Scripts/webkitpy/thirdparty/irc/irclib.py ? layout-test-results.zip ? local Summary of conflicts: Tree conflicts: 1 I'm not sure if there is a better combination of svn commands to use to revert to a known-good state.

And: rm -rf LayoutTests/imported/w3c/web-platform-tests/config.json

(In reply to comment #20) > And: rm -rf LayoutTests/imported/w3c/web-platform-tests/config.json Thanks for fixing this mess. This config.json should not trigger any issue with the bots as it should be overwritten at wpt server start and deleted at shutdown. Was it causing trouble? Would it help to svn/git ignore it?