160882 2016-08-15 17:14:28 -0700 webkitpy error in TestRunResults.merge() 2016-08-15 23:43:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser ap commit-queue glenn oldest_to_newest 1220253 0 simon.fraser 2016-08-15 17:14:28 -0700 webkitpy error in TestRunResults.merge() 1220255 1 286122 simon.fraser 2016-08-15 17:16:03 -0700 Created attachment 286122 Patch 1220256 2 286122 dbates 2016-08-15 17:18:12 -0700 Comment on attachment 286122 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=286122&action=review > Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py:100 > def merge(self, test_run_results): > + if not test_run_results: > + return self > # self.expectations should be the same for both > self.total += test_run_results.total We should consider writing a test for this logic. 1220367 3 286122 ap 2016-08-15 22:54:59 -0700 Comment on attachment 286122 Patch cq+ to unbreak EWS. 1220388 4 286122 commit-queue 2016-08-15 23:43:10 -0700 Comment on attachment 286122 Patch Clearing flags on attachment: 286122 Committed r204498: <http://trac.webkit.org/changeset/204498> 1220389 5 commit-queue 2016-08-15 23:43:15 -0700 All reviewed patches have been landed. Closing bug. 286122 2016-08-15 17:16:03 -0700 2016-08-15 23:43:10 -0700 Patch bug-160882-20160815171418.patch text/plain 1675 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjA0NDgyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzk5MDBlNDI2ODE4YzE3YjkzZGI0MTQxNTViYThjZThj MDE5YjlmYi4uYjYyZTM3ZGM1ZDYzMTZkZjFmOGMwZTgzYzJmZTU4NDlhZWMwZTNjNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4 IEBACiAyMDE2LTA4LTE1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CisgICAgICAgIHdlYmtpdHB5IGVycm9yIGluIFRlc3RSdW5SZXN1bHRzLm1lcmdlKCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDg4MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIGFy Z3VtZW50IHRvIFRlc3RSdW5SZXN1bHRzLm1lcmdlKCkgY2FuIGJlIE5vbmUgaWYgdGhlcmUgYXJl IG5vIGRldmljZS1zcGVjaWZjCisgICAgICAgIGluaXRpYWwgcmVzdWx0cyBvciByZXRyeSByZXN1 bHRzIGluIE1hbmFnZXIucnVuKCksIHNvIGp1c3QgcmV0dXJuIGVhcmx5IGluIHRoYXQgY2FzZS4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1 bl9yZXN1bHRzLnB5OgorICAgICAgICAoVGVzdFJ1blJlc3VsdHMubWVyZ2UpOgorCisyMDE2LTA4 LTE1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIFtp T1NdIEFkZCBpUGFkIHZpZXdwb3J0IGFuZCBmb3JtIHRlc3RzLCBhbmQgcmV2ZXJ0IHRoZSBpUGFk LXRlc3RpbmcgcGFydCBvZiByMjAyMTMyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjA4NzgKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3VsdHMucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weQppbmRl eCA5ZTcyZWQwM2FjNWU4M2U5Zjk2ZDM3YTI2OGYxYmQ4MzMzOTA2MDFjLi4yNmFjZWUxNzBhNDU1 YjQ2ZTg0Mzc4Y2JkYWQyMGQ2NGI0YjRjYTQ2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5w eQpAQCAtOTQsNiArOTQsOCBAQCBjbGFzcyBUZXN0UnVuUmVzdWx0cyhvYmplY3QpOgogICAgICAg ICAgICAgc2VsZi5zbG93X3Rlc3RzLmFkZCh0ZXN0X3Jlc3VsdC50ZXN0X25hbWUpCiAKICAgICBk ZWYgbWVyZ2Uoc2VsZiwgdGVzdF9ydW5fcmVzdWx0cyk6CisgICAgICAgIGlmIG5vdCB0ZXN0X3J1 bl9yZXN1bHRzOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYKICAgICAgICAgIyBzZWxmLmV4cGVj dGF0aW9ucyBzaG91bGQgYmUgdGhlIHNhbWUgZm9yIGJvdGgKICAgICAgICAgc2VsZi50b3RhbCAr PSB0ZXN0X3J1bl9yZXN1bHRzLnRvdGFsCiAgICAgICAgIHNlbGYucmVtYWluaW5nICs9IHRlc3Rf cnVuX3Jlc3VsdHMucmVtYWluaW5nCg==