70143 2011-10-14 14:14:16 -0700 Write unit test to ensure style-checker-filter option is passed properly in webkit-patch 2011-10-14 15:36:20 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 70119 1 dglazkov dglazkov abarth oldest_to_newest 484277 0 dglazkov 2011-10-14 14:14:16 -0700 From the comment: https://bugs.webkit.org/show_bug.cgi?id=70119#c2 484344 1 111091 dglazkov 2011-10-14 15:14:52 -0700 Created attachment 111091 Patch 484358 2 111091 abarth 2011-10-14 15:25:09 -0700 Comment on attachment 111091 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111091&action=review > Tools/Scripts/webkitpy/tool/commands/download_unittest.py:128 > + expected_stderr = "MOCK run_and_throw_if_fail: ['mock-prepare-ChangeLog', '--email=MOCK email', '--merge-base=None', 'MockFile1'], cwd=/mock-checkout\nMOCK run_and_throw_if_fail: ['mock-check-webkit-style', '--git-commit', 'MOCK git commit', '--diff-files', 'MockFile1', '--filter', '-changelog'], cwd=/mock-checkout\nMOCK run_command: ['ruby', '-I', '/mock-checkout/Websites/bugs.webkit.org/PrettyPatch', '/mock-checkout/Websites/bugs.webkit.org/PrettyPatch/prettify.rb'], cwd=None\nMOCK: user.open_url: file://...\nWas that diff correct?\nBuilding WebKit\nMOCK run_and_throw_if_fail: ['mock-build-webkit'], cwd=/mock-checkout\nRunning Python unit tests\nMOCK run_and_throw_if_fail: ['mock-test-webkitpy'], cwd=/mock-checkout\nRunning Perl unit tests\nMOCK run_and_throw_if_fail: ['mock-test-webkitperl'], cwd=/mock-checkout\nRunning Bindings tests\nMOCK run_and_throw_if_fail: ['mock-run-bindings-tests'], cwd=/mock-checkout\nRunning JavaScriptCore tests\nMOCK run_and_throw_if_fail: ['mock-run-javacriptcore-tests'], cwd=/mock-checkout\nRunning run-webkit-tests\nMOCK run_and_throw_if_fail: ['mock-run-webkit-tests', '--quiet'], cwd=/mock-checkout\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nCommitted r49824: <http://trac.webkit.org/changeset/49824>\nNo bug id provided.\n" We usually use heredoc style strings (you know, with """ quotes) so we can have each line of the string be on a separate line of source. That makes the expected results more readable and makes it easier to see the diffs. 484359 3 111091 abarth 2011-10-14 15:25:47 -0700 Comment on attachment 111091 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111091&action=review > Tools/Scripts/webkitpy/tool/steps/checkstyle.py:60 > - args.extend(self._options.check_style_filter) > + args.append(self._options.check_style_filter) boogs! 484364 4 dglazkov 2011-10-14 15:36:20 -0700 Committed r97521: <http://trac.webkit.org/changeset/97521> 111091 2011-10-14 15:14:52 -0700 2011-10-14 15:25:47 -0700 Patch bug-70143-20111014151450.patch text/plain 4068 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogOTc1MDQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjMjE5ZmMzZjhiNTc3NWFhYzkyYmM1NTY5NjMzMzZjMTdm ZTNjOGY4Li5kZTE0NjA1ZWNkNjQzMGJkNTc4MjE3NmE5OWZkN2ExN2M4NzJhOGU2IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTEtMTAtMTQgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4K IAorICAgICAgICBXcml0ZSB1bml0IHRlc3QgdG8gZW5zdXJlIHN0eWxlLWNoZWNrZXItZmlsdGVy IG9wdGlvbiBpcyBwYXNzZWQgcHJvcGVybHkgaW4gd2Via2l0LXBhdGNoCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDE0MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL2Rvd25sb2FkX3VuaXR0ZXN0LnB5OiBBZGRlZCBhIHRlc3QgZm9yIGxhbmQtY293 Ym95LiBOb3Qgc28gY293Ym95IGFmdGVyIGFsbC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvc3RlcHMvY2hlY2tzdHlsZS5weTogRml4ZWQgYSBidWcsIGRpc2NvdmVyZWQgYnkgdGhl IG5ld2x5IGFkZGVkIHRlc3QuCisKKzIwMTEtMTAtMTQgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6 a292QGNocm9taXVtLm9yZz4KKwogICAgICAgICBQbHVtYiBzdHlsZS1jaGVja2VyIGZpbHRlciB1 cCB0byBjb21tYW5kIG9wdGlvbnMgYW5kIG1ha2UgbGFuZC1jb3dib3kgdXNlIGl0LgogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzAxMTkKIApkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2FkX3VuaXR0 ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2FkX3Vu aXR0ZXN0LnB5CmluZGV4IDQzNzM1ZTQ0NWIwMTcxMjJmZGE5ZjM4ZjI4NjZkNDJmMWNlNzhlY2Eu LjFjYmY5ZGJkNDIwNWRhOGQ1MjY2ZWUwZDdlNDkzYzM2MDQ3NTg1MGUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZF91bml0dGVzdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWRfdW5pdHRl c3QucHkKQEAgLTEyNCw2ICsxMjQsMTEgQEAgTW9ja1dhdGNoTGlzdDogZGV0ZXJtaW5lX2NjX2Fu ZF9tZXNzYWdlcwogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG1vY2tfdG9vbC5zY20oKS5jcmVh dGVfcGF0Y2guY2FsbF9jb3VudCwgMCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChtb2NrX3Rv b2wuY2hlY2tvdXQoKS5tb2RpZmllZF9jaGFuZ2Vsb2dzLmNhbGxfY291bnQsIDEpCiAKKyAgICBk ZWYgdGVzdF9sYW5kX2Nvd2JveShzZWxmKToKKyAgICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIk1P Q0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ21vY2stcHJlcGFyZS1DaGFuZ2VMb2cnLCAnLS1l bWFpbD1NT0NLIGVtYWlsJywgJy0tbWVyZ2UtYmFzZT1Ob25lJywgJ01vY2tGaWxlMSddLCBjd2Q9 L21vY2stY2hlY2tvdXRcbk1PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ21vY2stY2hlY2st d2Via2l0LXN0eWxlJywgJy0tZ2l0LWNvbW1pdCcsICdNT0NLIGdpdCBjb21taXQnLCAnLS1kaWZm LWZpbGVzJywgJ01vY2tGaWxlMScsICctLWZpbHRlcicsICctY2hhbmdlbG9nJ10sIGN3ZD0vbW9j ay1jaGVja291dFxuTU9DSyBydW5fY29tbWFuZDogWydydWJ5JywgJy1JJywgJy9tb2NrLWNoZWNr b3V0L1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaCcsICcvbW9jay1jaGVja291 dC9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvcHJldHRpZnkucmInXSwgY3dk PU5vbmVcbk1PQ0s6IHVzZXIub3Blbl91cmw6IGZpbGU6Ly8uLi5cbldhcyB0aGF0IGRpZmYgY29y cmVjdD9cbkJ1aWxkaW5nIFdlYktpdFxuTU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsnbW9j ay1idWlsZC13ZWJraXQnXSwgY3dkPS9tb2NrLWNoZWNrb3V0XG5SdW5uaW5nIFB5dGhvbiB1bml0 IHRlc3RzXG5NT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydtb2NrLXRlc3Qtd2Via2l0cHkn XSwgY3dkPS9tb2NrLWNoZWNrb3V0XG5SdW5uaW5nIFBlcmwgdW5pdCB0ZXN0c1xuTU9DSyBydW5f YW5kX3Rocm93X2lmX2ZhaWw6IFsnbW9jay10ZXN0LXdlYmtpdHBlcmwnXSwgY3dkPS9tb2NrLWNo ZWNrb3V0XG5SdW5uaW5nIEJpbmRpbmdzIHRlc3RzXG5NT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFp bDogWydtb2NrLXJ1bi1iaW5kaW5ncy10ZXN0cyddLCBjd2Q9L21vY2stY2hlY2tvdXRcblJ1bm5p bmcgSmF2YVNjcmlwdENvcmUgdGVzdHNcbk1PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ21v Y2stcnVuLWphdmFjcmlwdGNvcmUtdGVzdHMnXSwgY3dkPS9tb2NrLWNoZWNrb3V0XG5SdW5uaW5n IHJ1bi13ZWJraXQtdGVzdHNcbk1PQ0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ21vY2stcnVu LXdlYmtpdC10ZXN0cycsICctLXF1aWV0J10sIGN3ZD0vbW9jay1jaGVja291dFxuQ29tbWl0dGVk IHI0OTgyNDogPGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQ5ODI0PlxuQ29tbWl0 dGVkIHI0OTgyNDogPGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzQ5ODI0PlxuTm8g YnVnIGlkIHByb3ZpZGVkLlxuIgorICAgICAgICBtb2NrX3Rvb2wgPSBNb2NrVG9vbChsb2dfZXhl Y3V0aXZlPVRydWUpCisgICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhMYW5kQ293 Ym95KCksIFs1MDAwMF0sIG9wdGlvbnM9c2VsZi5fZGVmYXVsdF9vcHRpb25zKCksIGV4cGVjdGVk X3N0ZGVycj1leHBlY3RlZF9zdGRlcnIsIHRvb2w9bW9ja190b29sKQorCiAgICAgZGVmIHRlc3Rf bGFuZF9yZWRfYnVpbGRlcnMoc2VsZik6CiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICdCdWls ZGluZyBXZWJLaXRcblJ1bm5pbmcgUHl0aG9uIHVuaXQgdGVzdHNcblJ1bm5pbmcgUGVybCB1bml0 IHRlc3RzXG5SdW5uaW5nIEJpbmRpbmdzIHRlc3RzXG5SdW5uaW5nIEphdmFTY3JpcHRDb3JlIHRl c3RzXG5SdW5uaW5nIHJ1bi13ZWJraXQtdGVzdHNcbkNvbW1pdHRlZCByNDk4MjQ6IDxodHRwOi8v dHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC80OTgyND5cblVwZGF0aW5nIGJ1ZyA1MDAwMFxuJwog ICAgICAgICBtb2NrX3Rvb2wgPSBNb2NrVG9vbCgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvY2hlY2tzdHlsZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9zdGVwcy9jaGVja3N0eWxlLnB5CmluZGV4IDRmNmMwNWMxYmNkYzhkYTE4MmQxM2Zj YzY2MWRiMTJjNDYzOTJjYmQuLmExYTMxODEzNGFjODkyMDIwMzJjNzVhYjQ4OTc1Y2RlNDA5ZWJh MTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jaGVja3N0 eWxlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jaGVja3N0eWxl LnB5CkBAIC01Nyw3ICs1Nyw3IEBAIGNsYXNzIENoZWNrU3R5bGUoQWJzdHJhY3RTdGVwKToKIAog ICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmNoZWNrX3N0eWxlX2ZpbHRlcjoKICAgICAgICAgICAg IGFyZ3MuYXBwZW5kKCItLWZpbHRlciIpCi0gICAgICAgICAgICBhcmdzLmV4dGVuZChzZWxmLl9v cHRpb25zLmNoZWNrX3N0eWxlX2ZpbHRlcikKKyAgICAgICAgICAgIGFyZ3MuYXBwZW5kKHNlbGYu X29wdGlvbnMuY2hlY2tfc3R5bGVfZmlsdGVyKQogCiAgICAgICAgIHRyeToKICAgICAgICAgICAg IHNlbGYuX3Rvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChzZWxmLl90b29sLnBv cnQoKS5jaGVja193ZWJraXRfc3R5bGVfY29tbWFuZCgpICsgYXJncywgY3dkPXNlbGYuX3Rvb2wu c2NtKCkuY2hlY2tvdXRfcm9vdCkK