65877 2011-08-08 14:24:22 -0700 SVNTest.test_svn_apply depends on the timezone of the computer executing the test 2013-01-21 19:36:15 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jochen jochen abarth eric hamaji webkit.review.bot oldest_to_newest 448265 0 jochen 2011-08-08 14:24:22 -0700 The test webkitpy.common.checkout.scm.scm_unittest.SVNTest.test_svn_apply depends on the timezone to execute correctly. It compares the modifications to ChangeLogs by svn-apply (which sets the date in PST8PDT http://trac.webkit.org/browser/trunk/Tools/Scripts/VCSUtils.pm#L1364) to the current local date. If the computer is not on the same day as the current date in PST8PDT, the test fails 450408 1 103766 jochen 2011-08-12 06:30:01 -0700 Created attachment 103766 Patch 450409 2 103766 jochen 2011-08-12 06:30:54 -0700 Comment on attachment 103766 Patch just so my nice patch isn't lost :) 450461 3 103766 eric 2011-08-12 09:25:16 -0700 Comment on attachment 103766 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103766&action=review > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:560 > + if hasattr(time, 'tzset'): > + has_tz = 'TZ' in os.environ > + old_tz = os.environ.get('TZ', '') > + os.environ['TZ'] = 'PST8PDT' > + time.tzset() I mean, we could make this less ugly by using with and an object. We'd have to be careful to do it so it works on Python 2.5. But something like the following: with TimezoneOverride('PST8PDT'): changelog_entry = changelog_entry.replace(....) class TimezoneOverride(object): def __init__(self, timezone_string): self.timezone_string = timezone_string def __enter__(self) // All the gunkto set up the timezone. def __exit__(self,type, value, traceback): // teardown. It doesn't get rid of the ugly code, but at least it puts it in a place we can clean it up later if wefigure out how to. 451632 4 104049 jochen 2011-08-16 08:27:53 -0700 Created attachment 104049 Patch 451634 5 jochen 2011-08-16 08:28:40 -0700 (In reply to comment #3) > (From update of attachment 103766 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103766&action=review > > > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:560 > > + if hasattr(time, 'tzset'): > > + has_tz = 'TZ' in os.environ > > + old_tz = os.environ.get('TZ', '') > > + os.environ['TZ'] = 'PST8PDT' > > + time.tzset() > > I mean, we could make this less ugly by using with and an object. We'd have to be careful to do it so it works on Python 2.5. But something like the following: > > with TimezoneOverride('PST8PDT'): > changelog_entry = changelog_entry.replace(....) > > class TimezoneOverride(object): > def __init__(self, timezone_string): > self.timezone_string = timezone_string > > def __enter__(self) > // All the gunkto set up the timezone. > > def __exit__(self,type, value, traceback): > // teardown. > > It doesn't get rid of the ugly code, but at least it puts it in a place we can clean it up later if wefigure out how to. Done the necessary magic to get the with statement for python 2.5 was already part of scm_unittests.py 452390 6 104049 eric 2011-08-17 11:19:35 -0700 Comment on attachment 104049 Patch Thank you! Making the hack self-contained like this ia huge benefit for the long-term health of this code. :) 452475 7 104049 webkit.review.bot 2011-08-17 12:35:00 -0700 Comment on attachment 104049 Patch Rejecting attachment 104049 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: svg-fonts-word-spacing.html = IMAGE+TEXT Regressions: Unexpected image mismatch : (5) fast/text/atsui-multiple-renderers.html = IMAGE fast/text/international/danda-space.html = IMAGE fast/text/international/thai-baht-space.html = IMAGE fast/text/international/thai-line-breaks.html = IMAGE platform/chromium-linux/fast/text/international/complex-joining-using-gpos.html = IMAGE Regressions: Unexpected text diff mismatch : (1) editing/selection/collapse-selection-in-bidi.html = TEXT Full output: http://queues.webkit.org/results/9420075 452477 8 104049 abarth 2011-08-17 12:37:23 -0700 Comment on attachment 104049 Patch Lies! 452562 9 104049 webkit.review.bot 2011-08-17 14:15:58 -0700 Comment on attachment 104049 Patch Rejecting attachment 104049 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: nt): Merge conflict in Tools/ChangeLog Failed to merge in the changes. Patch failed at 0001 <rdar://problem/9971293> Mid-word breaks can occur in the middle of a surrogate pair When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 146. Full output: http://queues.webkit.org/results/9422140 452570 10 104049 jochen 2011-08-17 14:19:06 -0700 Comment on attachment 104049 Patch cq, why do you hate me? 452680 11 104049 webkit.review.bot 2011-08-17 16:14:44 -0700 Comment on attachment 104049 Patch Clearing flags on attachment: 104049 Committed r93257: <http://trac.webkit.org/changeset/93257> 452681 12 webkit.review.bot 2011-08-17 16:14:49 -0700 All reviewed patches have been landed. Closing bug. 812539 13 mithro 2013-01-21 19:36:15 -0800 *** Bug 31391 has been marked as a duplicate of this bug. *** 103766 2011-08-12 06:30:01 -0700 2011-08-16 08:27:48 -0700 Patch bug-65877-20110812152959.patch text/plain 2253 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogOTI5NTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwY2IxOTY4MzZhNDgzMDM5ZjAzOTMyYTlhZjg4MDYzNmRl NjNlOGFmLi4zYzY0MzExZDFhMGFlYzI2ZWQ4ZWJjYjgzYzMzMjIxMDM2MjllNTYxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTEtMDgtMTEgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgTWFrZSBTVk5UZXN0LnRlc3Rfc3ZuX2FwcGx5IHVzZSB0aGUgc2FtZSB0aW1lem9u ZSBsb2dpYyBhcyBWQ1NVdGlscy5wbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjU4NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21f dW5pdHRlc3QucHk6CisKIDIwMTEtMDgtMTEgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2ds ZS5jb20+CiAKICAgICAgICAgW0Nocm9taXVtXVtEUlRdIGVkaXRpbmcvc3BlbGxpbmcvc3BlbGxp bmctYmFja3NwYWNlLWJldHdlZW4tbGluZXMuaHRtbCBmYWlscwpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkK aW5kZXggNGM2ZWI1NjY3OGI0NGI1OGQ2Mzg2OTBjOWExNzAwZmYyYzI1NGU2Yy4uNTk0MzYzMDgy MTI0MDQ5NWQzYWRmMjU1OWFmYWYxYzk5NDQ1MTRlOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CkBA IC00MSw2ICs0MSw3IEBAIGltcG9ydCBzdGF0CiBpbXBvcnQgc3lzCiBpbXBvcnQgc3VicHJvY2Vz cwogaW1wb3J0IHRlbXBmaWxlCitpbXBvcnQgdGltZQogaW1wb3J0IHVuaXR0ZXN0CiBpbXBvcnQg dXJsbGliCiBpbXBvcnQgc2h1dGlsCkBAIC01NTEsOCArNTUyLDIwIEBAIGNsYXNzIFNWTlRlc3Qo U0NNVGVzdCk6CiAgICAgZGVmIF9zZXRfZGF0ZV9hbmRfcmV2aWV3ZXIoY2hhbmdlbG9nX2VudHJ5 KToKICAgICAgICAgIyBKb2UgQ29vbCBtYXRjaGVzIHRoZSByZXZpZXdlciBzZXQgaW4gU0NNVGVz dC5fY3JlYXRlX3BhdGNoCiAgICAgICAgIGNoYW5nZWxvZ19lbnRyeSA9IGNoYW5nZWxvZ19lbnRy eS5yZXBsYWNlKCdSRVZJRVdFUl9IRVJFJywgJ0pvZSBDb29sJykKLSAgICAgICAgIyBzdm4tYXBw bHkgd2lsbCB1cGRhdGUgQ2hhbmdlTG9nIGVudHJpZXMgd2l0aCB0b2RheSdzIGRhdGUuCi0gICAg ICAgIHJldHVybiBjaGFuZ2Vsb2dfZW50cnkucmVwbGFjZSgnREFURV9IRVJFJywgZGF0ZS50b2Rh eSgpLmlzb2Zvcm1hdCgpKQorICAgICAgICAjIHN2bi1hcHBseSB3aWxsIHVwZGF0ZSBDaGFuZ2VM b2cgZW50cmllcyB3aXRoIHRvZGF5J3MgZGF0ZSAoYXMgaW4gQ3VwZXJ0aW5vLCBDQSwgVVMpCisg ICAgICAgIGlmIGhhc2F0dHIodGltZSwgJ3R6c2V0Jyk6CisgICAgICAgICAgICBoYXNfdHogPSAn VFonIGluIG9zLmVudmlyb24KKyAgICAgICAgICAgIG9sZF90eiA9IG9zLmVudmlyb24uZ2V0KCdU WicsICcnKQorICAgICAgICAgICAgb3MuZW52aXJvblsnVFonXSA9ICdQU1Q4UERUJworICAgICAg ICAgICAgdGltZS50enNldCgpCisgICAgICAgIGNoYW5nZWxvZ19lbnRyeSA9IGNoYW5nZWxvZ19l bnRyeS5yZXBsYWNlKCdEQVRFX0hFUkUnLCBkYXRlLnRvZGF5KCkuaXNvZm9ybWF0KCkpCisgICAg ICAgIGlmIGhhc2F0dHIodGltZSwgJ3R6c2V0Jyk6CisgICAgICAgICAgICBpZiBoYXNfdHo6Cisg ICAgICAgICAgICAgICAgb3MuZW52aXJvblsnVFonXSA9IG9sZF90egorICAgICAgICAgICAgZWxz ZToKKyAgICAgICAgICAgICAgICBkZWwgb3MuZW52aXJvblsnVFonXQorICAgICAgICAgICAgdGlt ZS50enNldCgpCisgICAgICAgIHJldHVybiBjaGFuZ2Vsb2dfZW50cnkKIAogICAgIGRlZiB0ZXN0 X3N2bl9hcHBseShzZWxmKToKICAgICAgICAgZmlyc3RfZW50cnkgPSAiIiIyMDA5LTEwLTI2ICBF cmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4K 104049 2011-08-16 08:27:53 -0700 2011-08-17 16:14:44 -0700 Patch bug-65877-20110816172751.patch text/plain 2692 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogOTI5NTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwY2IxOTY4MzZhNDgzMDM5ZjAzOTMyYTlhZjg4MDYzNmRl NjNlOGFmLi4zYzY0MzExZDFhMGFlYzI2ZWQ4ZWJjYjgzYzMzMjIxMDM2MjllNTYxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTEtMDgtMTEgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgTWFrZSBTVk5UZXN0LnRlc3Rfc3ZuX2FwcGx5IHVzZSB0aGUgc2FtZSB0aW1lem9u ZSBsb2dpYyBhcyBWQ1NVdGlscy5wbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjU4NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21f dW5pdHRlc3QucHk6CisKIDIwMTEtMDgtMTEgIE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2ds ZS5jb20+CiAKICAgICAgICAgW0Nocm9taXVtXVtEUlRdIGVkaXRpbmcvc3BlbGxpbmcvc3BlbGxp bmctYmFja3NwYWNlLWJldHdlZW4tbGluZXMuaHRtbCBmYWlscwpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkK aW5kZXggNGM2ZWI1NjY3OGI0NGI1OGQ2Mzg2OTBjOWExNzAwZmYyYzI1NGU2Yy4uZjdmNGI1ZTJl Y2FjZjI3MjA5M2JkY2I4N2RhMzdkMDRkOWEzZTFiMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CkBA IC00MSw2ICs0MSw3IEBAIGltcG9ydCBzdGF0CiBpbXBvcnQgc3lzCiBpbXBvcnQgc3VicHJvY2Vz cwogaW1wb3J0IHRlbXBmaWxlCitpbXBvcnQgdGltZQogaW1wb3J0IHVuaXR0ZXN0CiBpbXBvcnQg dXJsbGliCiBpbXBvcnQgc2h1dGlsCkBAIC01NDUsMTQgKzU0NiwzNiBAQCBPY21ZZXgmcmVEJDtz TzgqRjlMKUIKICAgICBkZWYgX3NoYXJlZF90ZXN0X2hlYWRfc3ZuX3JldmlzaW9uKHNlbGYpOgog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuc2NtLmhlYWRfc3ZuX3JldmlzaW9uKCksICc1 JykKIAorCisjIENvbnRleHQgbWFuYWdlciB0aGF0IG92ZXJyaWRlcyB0aGUgY3VycmVudCB0aW1l em9uZS4KK2NsYXNzIFRpbWV6b25lT3ZlcnJpZGUob2JqZWN0KToKKyAgICBkZWYgX19pbml0X18o c2VsZiwgdGltZXpvbmVfc3RyaW5nKToKKyAgICAgICAgc2VsZi5fdGltZXpvbmVfc3RyaW5nID0g dGltZXpvbmVfc3RyaW5nCisKKyAgICBkZWYgX19lbnRlcl9fKHNlbGYpOgorICAgICAgICBpZiBo YXNhdHRyKHRpbWUsICd0enNldCcpOgorICAgICAgICAgICAgc2VsZi5fc2F2ZWRfdGltZXpvbmUg PSBvcy5lbnZpcm9uLmdldCgnVFonLCBOb25lKQorICAgICAgICAgICAgb3MuZW52aXJvblsnVFon XSA9IHNlbGYuX3RpbWV6b25lX3N0cmluZworICAgICAgICAgICAgdGltZS50enNldCgpCisKKyAg ICBkZWYgX19leGl0X18oc2VsZiwgdHlwZSwgdmFsdWUsIHRyYWNlYmFjayk6CisgICAgICAgIGlm IGhhc2F0dHIodGltZSwgJ3R6c2V0Jyk6CisgICAgICAgICAgICBpZiBzZWxmLl9zYXZlZF90aW1l em9uZToKKyAgICAgICAgICAgICAgICBvcy5lbnZpcm9uWydUWiddID0gc2VsZi5fc2F2ZWRfdGlt ZXpvbmUKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgZGVsIG9zLmVudmlyb25b J1RaJ10KKyAgICAgICAgICAgIHRpbWUudHpzZXQoKQorCisKIGNsYXNzIFNWTlRlc3QoU0NNVGVz dCk6CiAKICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIF9zZXRfZGF0ZV9hbmRfcmV2aWV3ZXIo Y2hhbmdlbG9nX2VudHJ5KToKICAgICAgICAgIyBKb2UgQ29vbCBtYXRjaGVzIHRoZSByZXZpZXdl ciBzZXQgaW4gU0NNVGVzdC5fY3JlYXRlX3BhdGNoCiAgICAgICAgIGNoYW5nZWxvZ19lbnRyeSA9 IGNoYW5nZWxvZ19lbnRyeS5yZXBsYWNlKCdSRVZJRVdFUl9IRVJFJywgJ0pvZSBDb29sJykKLSAg ICAgICAgIyBzdm4tYXBwbHkgd2lsbCB1cGRhdGUgQ2hhbmdlTG9nIGVudHJpZXMgd2l0aCB0b2Rh eSdzIGRhdGUuCi0gICAgICAgIHJldHVybiBjaGFuZ2Vsb2dfZW50cnkucmVwbGFjZSgnREFURV9I RVJFJywgZGF0ZS50b2RheSgpLmlzb2Zvcm1hdCgpKQorICAgICAgICAjIHN2bi1hcHBseSB3aWxs IHVwZGF0ZSBDaGFuZ2VMb2cgZW50cmllcyB3aXRoIHRvZGF5J3MgZGF0ZSAoYXMgaW4gQ3VwZXJ0 aW5vLCBDQSwgVVMpCisgICAgICAgIHdpdGggVGltZXpvbmVPdmVycmlkZSgnUFNUOFBEVCcpOgor ICAgICAgICAgICAgcmV0dXJuIGNoYW5nZWxvZ19lbnRyeS5yZXBsYWNlKCdEQVRFX0hFUkUnLCBk YXRlLnRvZGF5KCkuaXNvZm9ybWF0KCkpCiAKICAgICBkZWYgdGVzdF9zdm5fYXBwbHkoc2VsZik6 CiAgICAgICAgIGZpcnN0X2VudHJ5ID0gIiIiMjAwOS0xMC0yNiAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+Cg==