36354 2010-03-19 02:55:08 -0700 Help sheriff-bot avoid warning about flaky tests (and add more unit testing) 2010-03-19 11:24:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned oldest_to_newest 201793 0 eric 2010-03-19 02:55:08 -0700 Help sheriff-bot avoid warning about flakey tests (and add more unit testing) 201797 1 51139 eric 2010-03-19 03:01:39 -0700 Created attachment 51139 Patch 201941 2 51139 abarth 2010-03-19 11:12:02 -0700 Comment on attachment 51139 Patch Ok. Let's try this. I'm not 100% sure this is the right way to avoid flaky tests, but it's worth a short. falky => flaky 201949 3 eric 2010-03-19 11:24:41 -0700 Committed r56248: <http://trac.webkit.org/changeset/56248> 51139 2010-03-19 03:01:39 -0700 2010-03-19 11:12:01 -0700 Patch bug-36354-20100319030137.patch text/plain 7765 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjNWQxZTM3Li45ZDVlZjBjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDMt MTkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhlbHAgc2hlcmlmZi1ib3QgYXZvaWQgd2Fybmlu ZyBhYm91dCBmbGFreSB0ZXN0cyAoYW5kIGFkZCBtb3JlIHVuaXQgdGVzdGluZykKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MzU0CisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2J1aWxkYm90LnB5OgorICAgICAgICAgLSBNYWtlIEJ1aWxkIGNy ZWF0aW9uIGVhc2llciB0byBNb2NrIGFuZCB0ZXN0CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9idWlsZGJvdF91bml0dGVzdC5weToKKyAgICAgICAgIC0gVGVzdCBmaW5kaW5nIGdyZWVuIHRv IHJlZCB0cmFuc2l0aW9ucyBhbmQgc3VzcGVjdCByZXZpc2lvbnMKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2NvbW1hbmRzL3F1ZXJpZXMucHk6CisgICAgICAgICAtIE1ha2Ugd2hhdC1icm9r ZSBub3RlIHdoZW4gYnVpbGRlcnMgaGF2ZSBvbmx5IGZhaWxlZCBvbmNlLgorCiAyMDEwLTAzLTE5 ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYnVpbGRib3QucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2J1aWxkYm90LnB5CmluZGV4IDc0OTQ3OGEuLmMz ZThiM2YgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYnVpbGRib3Qu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9idWlsZGJvdC5weQpAQCAtNTMs MTUgKzUzLDIzIEBAIGNsYXNzIEJ1aWxkZXIob2JqZWN0KToKICAgICBkZWYgdXJsKHNlbGYpOgog ICAgICAgICByZXR1cm4gImh0dHA6Ly8lcy9idWlsZGVycy8lcyIgJSAoc2VsZi5fYnVpbGRib3Qu YnVpbGRib3RfaG9zdCwgdXJsbGliLnF1b3RlKHNlbGYuX25hbWUpKQogCisgICAgIyBUaGlzIHBy b3ZpZGVzIGEgc2luZ2xlIHBsYWNlIHRvIG1vY2sKKyAgICBkZWYgX2ZldGNoX2J1aWxkKHNlbGYs IGJ1aWxkX251bWJlcik6CisgICAgICAgIGJ1aWxkX2RpY3Rpb25hcnkgPSBzZWxmLl9idWlsZGJv dC5fZmV0Y2hfeG1scnBjX2J1aWxkX2RpY3Rpb25hcnkoc2VsZiwgYnVpbGRfbnVtYmVyKQorICAg ICAgICBpZiBub3QgYnVpbGRfZGljdGlvbmFyeToKKyAgICAgICAgICAgIHJldHVybiBOb25lCisg ICAgICAgIHJldHVybiBCdWlsZChzZWxmLAorICAgICAgICAgICAgYnVpbGRfbnVtYmVyPWludChi dWlsZF9kaWN0aW9uYXJ5WydudW1iZXInXSksCisgICAgICAgICAgICByZXZpc2lvbj1pbnQoYnVp bGRfZGljdGlvbmFyeVsncmV2aXNpb24nXSksCisgICAgICAgICAgICBpc19ncmVlbj0oYnVpbGRf ZGljdGlvbmFyeVsncmVzdWx0cyddID09IDApICMgVW5kb2N1bWVudGVkLCBidWlsZGJvdCBYTUxS UEMsIDAgc2VlbXMgdG8gbWVhbiAicGFzcyIKKyAgICAgICAgKQorCiAgICAgZGVmIGJ1aWxkKHNl bGYsIGJ1aWxkX251bWJlcik6CiAgICAgICAgIGNhY2hlZF9idWlsZCA9IHNlbGYuX2J1aWxkc19j YWNoZS5nZXQoYnVpbGRfbnVtYmVyKQogICAgICAgICBpZiBjYWNoZWRfYnVpbGQ6CiAgICAgICAg ICAgICByZXR1cm4gY2FjaGVkX2J1aWxkCiAKLSAgICAgICAgYnVpbGRfZGljdGlvbmFyeSA9IHNl bGYuX2J1aWxkYm90Ll9mZXRjaF94bWxycGNfYnVpbGRfZGljdGlvbmFyeShzZWxmLCBidWlsZF9u dW1iZXIpCi0gICAgICAgIGlmIG5vdCBidWlsZF9kaWN0aW9uYXJ5OgotICAgICAgICAgICAgcmV0 dXJuIE5vbmUKLSAgICAgICAgYnVpbGQgPSBCdWlsZChidWlsZF9kaWN0aW9uYXJ5LCBzZWxmKQor ICAgICAgICBidWlsZCA9IHNlbGYuX2ZldGNoX2J1aWxkKGJ1aWxkX251bWJlcikKICAgICAgICAg c2VsZi5fYnVpbGRzX2NhY2hlW2J1aWxkX251bWJlcl0gPSBidWlsZAogICAgICAgICByZXR1cm4g YnVpbGQKIApAQCAtODcsMjIgKzk1LDI0IEBAIGNsYXNzIEJ1aWxkZXIob2JqZWN0KToKICAgICAg ICAgICAgIGxvb2tfYmFja19jb3VudCArPSAxCiAgICAgICAgIHJldHVybiAoZ3JlZW5fYnVpbGQs IHJlZF9idWlsZCkKIAotICAgIGRlZiBzdXNwZWN0X3JldmlzaW9uc19mb3JfZ3JlZW5fdG9fcmVk X3RyYW5zaXRpb24oc2VsZiwgcmVkX2J1aWxkX251bWJlciwgbG9va19iYWNrX2xpbWl0PTMwKToK KyAgICBkZWYgc3VzcGVjdF9yZXZpc2lvbnNfZm9yX2dyZWVuX3RvX3JlZF90cmFuc2l0aW9uKHNl bGYsIHJlZF9idWlsZF9udW1iZXIsIGxvb2tfYmFja19saW1pdD0zMCwgYXZvaWRfZmxha2V5X3Rl c3RzPVRydWUpOgogICAgICAgICAobGFzdF9ncmVlbl9idWlsZCwgZmlyc3RfcmVkX2J1aWxkKSA9 IHNlbGYuZmluZF9ncmVlbl90b19yZWRfdHJhbnNpdGlvbihyZWRfYnVpbGRfbnVtYmVyLCBsb29r X2JhY2tfbGltaXQpCiAgICAgICAgIGlmIG5vdCBsYXN0X2dyZWVuX2J1aWxkOgogICAgICAgICAg ICAgcmV0dXJuIFtdICMgV2UgcmFuIG9mZiB0aGUgbGltaXQgb2Ygb3VyIHNlYXJjaAorICAgICAg ICAjIGlmIGF2b2lkX2ZsYWtleV90ZXN0cywgcmVxdWlyZSBhdCBsZWFzdCAyIHJlZCBidWlsZHMg YmVmb3JlIHdlIHN1c3BlY3QgYSBncmVlbiB0byByZWQgdHJhbnNpdGlvbi4KKyAgICAgICAgaWYg YXZvaWRfZmxha2V5X3Rlc3RzIGFuZCBmaXJzdF9yZWRfYnVpbGQgPT0gc2VsZi5idWlsZChyZWRf YnVpbGRfbnVtYmVyKToKKyAgICAgICAgICAgIHJldHVybiBbXQogICAgICAgICBzdXNwZWN0X3Jl dmlzaW9ucyA9IHJhbmdlKGZpcnN0X3JlZF9idWlsZC5yZXZpc2lvbigpLCBsYXN0X2dyZWVuX2J1 aWxkLnJldmlzaW9uKCksIC0xKQogICAgICAgICBzdXNwZWN0X3JldmlzaW9ucy5yZXZlcnNlKCkK ICAgICAgICAgcmV0dXJuIHN1c3BlY3RfcmV2aXNpb25zCiAKIAogY2xhc3MgQnVpbGQob2JqZWN0 KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgYnVpbGRfZGljdGlvbmFyeSwgYnVpbGRlcik6Cisg ICAgZGVmIF9faW5pdF9fKHNlbGYsIGJ1aWxkZXIsIGJ1aWxkX251bWJlciwgcmV2aXNpb24sIGlz X2dyZWVuKToKICAgICAgICAgc2VsZi5fYnVpbGRlciA9IGJ1aWxkZXIKLSAgICAgICAgIyBGSVhN RTogS25vd2xlZGdlIG9mIHRoZSBYTUxSUEMgc3BlY2lmaWNzIHNob3VsZCBwcm9iYWJseSBub3Qg Z28gaGVyZS4KLSAgICAgICAgc2VsZi5fcmV2aXNpb24gPSBpbnQoYnVpbGRfZGljdGlvbmFyeVsn cmV2aXNpb24nXSkKLSAgICAgICAgc2VsZi5fbnVtYmVyID0gaW50KGJ1aWxkX2RpY3Rpb25hcnlb J251bWJlciddKQotICAgICAgICBzZWxmLl9pc19ncmVlbiA9IChidWlsZF9kaWN0aW9uYXJ5Wydy ZXN1bHRzJ10gPT0gMCkgIyBVbmRvY3VtZW50ZWQsIGJ1aWxkYm90IFhNTFJQQworICAgICAgICBz ZWxmLl9udW1iZXIgPSBidWlsZF9udW1iZXIKKyAgICAgICAgc2VsZi5fcmV2aXNpb24gPSByZXZp c2lvbgorICAgICAgICBzZWxmLl9pc19ncmVlbiA9IGlzX2dyZWVuCiAKICAgICBAc3RhdGljbWV0 aG9kCiAgICAgZGVmIGJ1aWxkX3VybChidWlsZGVyLCBidWlsZF9udW1iZXIpOgpkaWZmIC0tZ2l0 IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9idWlsZGJvdF91bml0dGVzdC5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYnVpbGRib3RfdW5pdHRlc3QucHkKaW5kZXggZThj ZjZlYy4uOGRlYWY5YSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9i dWlsZGJvdF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2J1 aWxkYm90X3VuaXR0ZXN0LnB5CkBAIC0yOCwxMSArMjgsNDYgQEAKIAogaW1wb3J0IHVuaXR0ZXN0 CiAKLWZyb20gd2Via2l0cHkuYnVpbGRib3QgaW1wb3J0IEJ1aWxkQm90Citmcm9tIHdlYmtpdHB5 LmJ1aWxkYm90IGltcG9ydCBCdWlsZEJvdCwgQnVpbGRlciwgQnVpbGQKIAogZnJvbSB3ZWJraXRw eS50aGlyZHBhcnR5LkJlYXV0aWZ1bFNvdXAgaW1wb3J0IEJlYXV0aWZ1bFNvdXAKIAogCitjbGFz cyBCdWlsZGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CisKKyAgICBkZWYgc2V0VXAoc2VsZik6 CisgICAgICAgIHNlbGYuYnVpbGRib3QgPSBCdWlsZEJvdCgpCisgICAgICAgIHNlbGYuYnVpbGRl ciA9IEJ1aWxkZXIoIlRlc3QgQnVpbGRlciIsIHNlbGYuYnVpbGRib3QpCisgICAgICAgIGRlZiBf bW9ja19mZXRjaF9idWlsZChidWlsZF9udW1iZXIpOgorICAgICAgICAgICAgcmV0dXJuIEJ1aWxk KAorICAgICAgICAgICAgICAgIGJ1aWxkZXI9c2VsZi5idWlsZGVyLAorICAgICAgICAgICAgICAg IGJ1aWxkX251bWJlcj1idWlsZF9udW1iZXIsCisgICAgICAgICAgICAgICAgcmV2aXNpb249YnVp bGRfbnVtYmVyICsgMTAwMCwKKyAgICAgICAgICAgICAgICBpc19ncmVlbj1idWlsZF9udW1iZXIg PCA0CisgICAgICAgICAgICApCisgICAgICAgIHNlbGYuYnVpbGRlci5fZmV0Y2hfYnVpbGQgPSBf bW9ja19mZXRjaF9idWlsZAorCisgICAgZGVmIHRlc3RfZmluZF9ncmVlbl90b19yZWRfdHJhbnNp dGlvbihzZWxmKToKKyAgICAgICAgKGdyZWVuX2J1aWxkLCByZWRfYnVpbGQpID0gc2VsZi5idWls ZGVyLmZpbmRfZ3JlZW5fdG9fcmVkX3RyYW5zaXRpb24oMTApCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoZ3JlZW5fYnVpbGQucmV2aXNpb24oKSwgMTAwMykKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChyZWRfYnVpbGQucmV2aXNpb24oKSwgMTAwNCkKKworICAgICAgICAoZ3JlZW5fYnVpbGQs IHJlZF9idWlsZCkgPSBzZWxmLmJ1aWxkZXIuZmluZF9ncmVlbl90b19yZWRfdHJhbnNpdGlvbigx MCwgbG9va19iYWNrX2xpbWl0PTIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZ3JlZW5fYnVp bGQsIE5vbmUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVkX2J1aWxkLnJldmlzaW9uKCks IDEwMDgpCisKKyAgICBkZWYgdGVzdF9zdXNwZWN0X3JldmlzaW9uc19mb3JfZ3JlZW5fdG9fcmVk X3RyYW5zaXRpb24oc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVy LnN1c3BlY3RfcmV2aXNpb25zX2Zvcl9ncmVlbl90b19yZWRfdHJhbnNpdGlvbigxMCksIFsxMDA0 XSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmJ1aWxkZXIuc3VzcGVjdF9yZXZpc2lv bnNfZm9yX2dyZWVuX3RvX3JlZF90cmFuc2l0aW9uKDEwLCBsb29rX2JhY2tfbGltaXQ9MiksIFtd KQorICAgICAgICAjIEZsYWtleSB0ZXN0IGF2b2lkYW5jZSByZXF1aXJlcyBhdCBsZWFzdCAyIHJl ZCBidWlsZHM6CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVyLnN1c3BlY3Rf cmV2aXNpb25zX2Zvcl9ncmVlbl90b19yZWRfdHJhbnNpdGlvbig0KSwgW10pCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVyLnN1c3BlY3RfcmV2aXNpb25zX2Zvcl9ncmVlbl90 b19yZWRfdHJhbnNpdGlvbig0LCBhdm9pZF9mbGFrZXlfdGVzdHM9RmFsc2UpLCBbMTAwNF0pCisg ICAgICAgICMgR3JlZW4gYnVpbGRlcjoKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmJ1 aWxkZXIuc3VzcGVjdF9yZXZpc2lvbnNfZm9yX2dyZWVuX3RvX3JlZF90cmFuc2l0aW9uKDMpLCBb XSkKKworICAgIGRlZiB0ZXN0X2J1aWxkX2NhY2hpbmcoc2VsZik6CisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoc2VsZi5idWlsZGVyLmJ1aWxkKDEwKSwgc2VsZi5idWlsZGVyLmJ1aWxkKDEwKSkK KwogY2xhc3MgQnVpbGRCb3RUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIF9leGFtcGxl X29uZV9ib3hfc3RhdHVzID0gJycnCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1hbmRzL3F1ZXJpZXMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1hbmRzL3F1ZXJpZXMucHkKaW5kZXggNTJhMjNjOC4uMTljMmRkMCAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tYW5kcy9xdWVyaWVzLnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWFuZHMvcXVlcmllcy5weQpAQCAtMTI3LDcg KzEyNyw3IEBAIGNsYXNzIFdoYXRCcm9rZShBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CiAK ICAgICAjIEZJWE1FOiBUaGlzIGlzIHNsaWdodGx5IGRpZmZlcmVudCBmcm9tIEJ1aWxkZXIuc3Vz cGVjdF9yZXZpc2lvbnNfZm9yX2dyZWVuX3RvX3JlZF90cmFuc2l0aW9uCiAgICAgIyBkdWUgdG8g bmVlZGluZyB0byBkZXRlY3QgdGhlICJoaXQgdGhlIGxpbWl0IiBjYXNlIGFuIHByaW50IGEgc3Bl Y2lhbCBtZXNzYWdlLgotICAgIGRlZiBfcHJpbnRfYmxhbWVfaW5mb3JtYXRpb25fZm9yX2J1aWxk ZXIoc2VsZiwgYnVpbGRlcl9zdGF0dXMsIG5hbWVfd2lkdGgpOgorICAgIGRlZiBfcHJpbnRfYmxh bWVfaW5mb3JtYXRpb25fZm9yX2J1aWxkZXIoc2VsZiwgYnVpbGRlcl9zdGF0dXMsIG5hbWVfd2lk dGgsIGF2b2lkX2ZsYWtleV90ZXN0cz1UcnVlKToKICAgICAgICAgYnVpbGRlciA9IHNlbGYudG9v bC5idWlsZGJvdC5idWlsZGVyX3dpdGhfbmFtZShidWlsZGVyX3N0YXR1c1sibmFtZSJdKQogICAg ICAgICAobGFzdF9ncmVlbl9idWlsZCwgZmlyc3RfcmVkX2J1aWxkKSA9IGJ1aWxkZXIuZmluZF9n cmVlbl90b19yZWRfdHJhbnNpdGlvbihidWlsZGVyX3N0YXR1c1siYnVpbGRfbnVtYmVyIl0pCiAg ICAgICAgIGlmIG5vdCBsYXN0X2dyZWVuX2J1aWxkOgpAQCAtMTM2LDcgKzEzNiwxMCBAQCBjbGFz cyBXaGF0QnJva2UoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgogCiAgICAgICAgIHN1c3Bl Y3RfcmV2aXNpb25zID0gcmFuZ2UoZmlyc3RfcmVkX2J1aWxkLnJldmlzaW9uKCksIGxhc3RfZ3Jl ZW5fYnVpbGQucmV2aXNpb24oKSwgLTEpCiAgICAgICAgIHN1c3BlY3RfcmV2aXNpb25zLnJldmVy c2UoKQotICAgICAgICBzZWxmLl9wcmludF9idWlsZGVyX2xpbmUoYnVpbGRlci5uYW1lKCksIG5h bWVfd2lkdGgsICJGQUlMIChibGFtZS1saXN0OiAlcykiICUgc3VzcGVjdF9yZXZpc2lvbnMpCisg ICAgICAgIGZpcnN0X2ZhaWx1cmVfbWVzc2FnZSA9ICIiCisgICAgICAgIGlmIChmaXJzdF9yZWRf YnVpbGQgPT0gYnVpbGRlci5idWlsZChidWlsZGVyX3N0YXR1c1siYnVpbGRfbnVtYmVyIl0pKToK KyAgICAgICAgICAgIGZpcnN0X2ZhaWx1cmVfbWVzc2FnZSA9ICIgRklSU1QgRkFJTFVSRSwgcG9z c2libHkgYSBmYWxreSB0ZXN0IgorICAgICAgICBzZWxmLl9wcmludF9idWlsZGVyX2xpbmUoYnVp bGRlci5uYW1lKCksIG5hbWVfd2lkdGgsICJGQUlMIChibGFtZS1saXN0OiAlcyVzKSIgJSAoc3Vz cGVjdF9yZXZpc2lvbnMsIGZpcnN0X2ZhaWx1cmVfbWVzc2FnZSkpCiAgICAgICAgIGZvciByZXZp c2lvbiBpbiBzdXNwZWN0X3JldmlzaW9uczoKICAgICAgICAgICAgIGNvbW1pdF9pbmZvID0gQ29t bWl0SW5mby5jb21taXRfaW5mb19mb3JfcmV2aXNpb24oc2VsZi50b29sLnNjbSgpLCByZXZpc2lv bikKICAgICAgICAgICAgIHNlbGYuX3ByaW50X2JsYW1lX2luZm9ybWF0aW9uX2Zvcl9jb21taXQo Y29tbWl0X2luZm8pCg==