Bug 221286 – [LayoutTests] Convert http/tests/appcache convert PHP to Python

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Chris Gambrell]

Replacing PHP with equivalent Python CGI scripts

[Radar WebKit Bug Importer]

<rdar://problem/73893844>

[Chris Gambrell]

Created attachment 419063 [details]
Patch

[Chris Gambrell]

Created attachment 419064 [details]
Patch

[Alexey Proskuryakov]

Comment on attachment 419064 [details]
Patch

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

> LayoutTests/http/tests/appcache/resources/slow-resource.py:7
> +time.sleep(1 / 100000)

Why does this use 1 / 100000? I thought that the argument was seconds for both PHP and Python.

[Chris Gambrell]

(In reply to Alexey Proskuryakov from comment #4)
> Comment on attachment 419064 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=419064&action=review
> 
> > LayoutTests/http/tests/appcache/resources/slow-resource.py:7
> > +time.sleep(1 / 100000)
> 
> Why does this use 1 / 100000? I thought that the argument was seconds for
> both PHP and Python.

You are correct. I must have accidentally had the 'usleep' documentation pulled up instead of the 'sleep' for PHP. Will fix this in the next patch I push.

[Chris Gambrell]

Created attachment 419088 [details]
Patch

[Chris Gambrell]

(In reply to Chris Gambrell from comment #6)
> Created attachment 419088 [details]
> Patch

Failed mac-wk1, mac-wb2. identifier-test.py incorrectly sent status

[Chris Gambrell]

Created attachment 419091 [details]
Patch

[Chris Gambrell]

Created attachment 419092 [details]
Patch

[Chris Gambrell]

Created attachment 419093 [details]
Patch

[Chris Gambrell]

Created attachment 419140 [details]
Patch

[Chris Gambrell]

Created attachment 419150 [details]
Patch

[Chris Gambrell]

Created attachment 419158 [details]
Patch

[Chris Gambrell]

Created attachment 419186 [details]
Patch

[Chris Gambrell]

Created attachment 419197 [details]
Patch

[Chris Gambrell]

Created attachment 419207 [details]
Patch

[Chris Gambrell]

Created attachment 419281 [details]
Patch

[Chris Gambrell]

Created attachment 419292 [details]
Patch

[Chris Gambrell]

Created attachment 419304 [details]
Patch

[Chris Gambrell]

Created attachment 419319 [details]
Patch

[Chris Gambrell]

Created attachment 419326 [details]
Patch

[Chris Gambrell]

Created attachment 419330 [details]
Patch

[Chris Gambrell]

Created attachment 419349 [details]
Patch

[Chris Gambrell]

Created attachment 419353 [details]
Patch

[Chris Gambrell]

Created attachment 419356 [details]
Patch

[Chris Gambrell]

Created attachment 419398 [details]
Patch

[Chris Gambrell]

Created attachment 419419 [details]
Patch

[Chris Gambrell]

Created attachment 419435 [details]
Patch

[Chris Gambrell]

Created attachment 419446 [details]
Patch

[Chris Gambrell]

Created attachment 419448 [details]
Patch

[Chris Gambrell]

Created attachment 419458 [details]
Patch

[Chris Gambrell]

Created attachment 419472 [details]
Patch

[Chris Gambrell]

Created attachment 419479 [details]
Patch

[Chris Gambrell]

Created attachment 419484 [details]
Patch

[Chris Gambrell]

Created attachment 419486 [details]
Patch

[Chris Gambrell]

Created attachment 424052 [details]
Patch

[Chris Gambrell]

Created attachment 424065 [details]
Patch

[Chris Gambrell]

Created attachment 424092 [details]
Patch

[Chris Gambrell]

Created attachment 424097 [details]
Patch

[Chris Gambrell]

Comment on attachment 424097 [details]
Patch

http/tests/appcache/resources/manifest-protected-script.php was not used and removed from the directory

[Jonathan Bedard]

Comment on attachment 424097 [details]
Patch

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

> LayoutTests/http/tests/appcache/resources/fail-on-update-2.py:9
> +http_root = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(file))))

I don't see us using this, although maybe we should leverage the getState/setState in http/tests/resources/portabilityLayer.py instead of duplicating it.

> LayoutTests/http/tests/appcache/resources/fail-on-update.py:11
> +http_root = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(file))))

I don't see us using this, although maybe we should leverage the getState/setState in http/tests/resources/portabilityLayer.py instead of duplicating it.

> LayoutTests/http/tests/appcache/resources/online-allowlist.py:10
> +http_root = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(file))))

I don't see us using this.

> LayoutTests/http/tests/appcache/resources/remove-cache.py:11
> +http_root = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(file))))

I don't see us using this, although maybe we should leverage the getState/setState in http/tests/resources/portabilityLayer.py instead of duplicating it.

> LayoutTests/http/tests/appcache/resources/update-cache.py:11
> +http_root = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(file))))

I don't see us using this, although the "step_counter" hear looks pretty similar to the one used in another file in this change.

[Chris Gambrell]

Created attachment 424779 [details]
Patch

[Chris Gambrell]

Comment on attachment 424779 [details]
Patch

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

> LayoutTests/ChangeLog:70
> +        * http/tests/appcache/resources/manifest-protected-script.php: Removed.

File not used by any tests

> LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php:-1
> -<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->

Moved to LayoutTests/TestExpectations

> LayoutTests/http/tests/appcache/fail-on-update-2.html:-1
> -<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->

Moved to LayoutTests/TestExpectations

> LayoutTests/http/tests/appcache/fail-on-update.html:-1
> -<!-- webkit-test-runner [ dumpJSConsoleLogInStdErr=true ] -->

Moved to LayoutTests/TestExpectations

[Jonathan Bedard]

Comment on attachment 424779 [details]
Patch

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

> LayoutTests/http/tests/appcache/resources/cookie-protected-script.py:13
> +        cookies[cookie[0]] = cookie[1]

You're about to land get_cookies in https://bugs.webkit.org/show_bug.cgi?id=223891, no?

> LayoutTests/http/tests/appcache/resources/fail-on-update.py:13
> +def set_state(new_state, file):

Seems like we should be using from resources.portabilityLayer import set_state here

> LayoutTests/http/tests/appcache/resources/fallback-redirect.py:10
> +    'Content-Type: text/html\r\n\r\n'

No 307?

> LayoutTests/http/tests/appcache/resources/manifest-if-cookie.py:13
> +        cookies[cookie[0]] = cookie[1]

You're about to land get_cookies in https://bugs.webkit.org/show_bug.cgi?id=223891, no?

> LayoutTests/http/tests/appcache/resources/online-allowlist.py:10
> +http_root = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(file))))

Doesn't look like we're using this

> LayoutTests/http/tests/appcache/resources/remove-cache.py:13
> +def set_state(new_state, file):

Seems like we should be using from resources.portabilityLayer import set_state here

> LayoutTests/http/tests/appcache/resources/update-cache.py:11
> +http_root = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(file))))

Doesn't look like we are using this.

> LayoutTests/http/tests/appcache/resources/scope1/cookie-protected-manifest.py:13
> +        cookies[cookie[0]] = cookie[1]

Consider using the shared get_cookie function you are about to land.

> LayoutTests/http/tests/appcache/resources/scope2/cookie-protected-script.py:13
> +        cookies[cookie[0]] = cookie[1]

Consider using the shared get_cookie function you are about to land

[Chris Gambrell]

Created attachment 424845 [details]
Patch

[EWS]

Committed r275332: <https://commits.webkit.org/r275332>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 424845 [details].