89564 2012-06-20 06:25:48 -0700 Add master.cfg unittest to help migration - pass BuildStep instances instead of BuildStep subclasses 2012-06-27 01:28:15 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 89001 1 ossy ossy galpeter lforschler ossy rniwa tony wsiegrist oldest_to_newest 653398 0 ossy 2012-06-20 06:25:48 -0700 See https://bugs.webkit.org/show_bug.cgi?id=89001 for details. 653402 1 148551 ossy 2012-06-20 06:28:52 -0700 Created attachment 148551 Patch 653412 2 ossy 2012-06-20 06:34:42 -0700 Here is an example why this unittest useful. Let's try to fix CheckOutSource buildstep: - self.addStep(CheckOutSource) + self.addStep(CheckOutSource()) We will get the following error message: ====================================================================== FAIL: test_builder00_step01 (__main__.BuildStepsConstructorTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "./mastercfg_unittest.py", line 351, in doTest self.fail("Error during instantiation %s buildstep for %s builder: %s\n" % (buildStepName, builder['name'].encode('ascii', 'ignore'), e)) AssertionError: Error during instantiation CheckOutSource buildstep for Apple SnowLeopard Release (Build) builder: __init__() got multiple values for keyword argument 'mode' ====================================================================== FAIL: test_builder01_step01 (__main__.BuildStepsConstructorTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "./mastercfg_unittest.py", line 351, in doTest self.fail("Error during instantiation %s buildstep for %s builder: %s\n" % (buildStepName, builder['name'].encode('ascii', 'ignore'), e)) AssertionError: Error during instantiation CheckOutSource buildstep for Apple SnowLeopard Debug (Build) builder: __init__() got multiple values for keyword argument 'mode' ... [snip] ... FAILED (failures=42) It means we handle mode incorrect in CheckoutSource's constructor. And here is the solution which pass unittests too: https://bugs.webkit.org/show_bug.cgi?id=89215 653419 3 148555 ossy 2012-06-20 06:41:47 -0700 Created attachment 148555 Patch Minor fix: Don't pass the whole builder object to doTest, but only the name of the builder. 657612 4 ossy 2012-06-26 08:06:47 -0700 ping review? 657934 5 148555 tony 2012-06-26 13:38:15 -0700 Comment on attachment 148555 Patch I don't really know the history of this unit test file, but the code seems fine. 657935 6 148555 tony 2012-06-26 13:39:15 -0700 Comment on attachment 148555 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148555&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:348 > + (buildStepFactory, kwargs) = step Nit: no () on the left side of the assignment. 658449 7 ossy 2012-06-27 01:27:33 -0700 Committed r121328: <http://trac.webkit.org/changeset/121328> 658450 8 148555 ossy 2012-06-27 01:28:15 -0700 Comment on attachment 148555 Patch Landed with the nit fix. 148551 2012-06-20 06:28:52 -0700 2012-06-20 06:41:40 -0700 Patch bug-89564-20120620152851.patch text/plain 2972 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwODEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzZmMWMzNGUwYzg1ODliNzNkM2I4NjJkMzNkYWMyOGY1 YTUyNGFhYS4uMmUyYjFlOTUzMWYwM2NlNjNkZTVkY2NkZmU1NGZhMWZiMmNkODhlZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA2LTIwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgQWRkIG1hc3Rlci5jZmcgdW5pdHRlc3QgdG8gaGVscCBtaWdyYXRpb24gLSBwYXNz IEJ1aWxkU3RlcCBpbnN0YW5jZXMgaW5zdGVhZCBvZiBCdWlsZFN0ZXAgc3ViY2xhc3NlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk1NjQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5weToKKyAg ICAgICAgKEJ1aWxkU3RlcHNDb25zdHJ1Y3RvclRlc3QpOgorICAgICAgICAoQnVpbGRTdGVwc0Nv bnN0cnVjdG9yVGVzdC5nZW5lcmF0ZVRlc3RzKToKKyAgICAgICAgKEJ1aWxkU3RlcHNDb25zdHJ1 Y3RvclRlc3QuY3JlYXRlVGVzdCk6CisgICAgICAgIChCdWlsZFN0ZXBzQ29uc3RydWN0b3JUZXN0 LmNyZWF0ZVRlc3QuZG9UZXN0KToKKwogMjAxMi0wNi0xOSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNo b2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF1bUmVncmVzc2lvbl0gQnVpbGQgYnJlYWsg YWZ0ZXIgcjEyMDc4NgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvbWFzdGVyY2ZnX3VuaXR0ZXN0LnB5IGIvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyY2ZnX3VuaXR0ZXN0LnB5Cmlu ZGV4IDEwMTQ1MWZjOTg0MDRmYzQ0NmE0ZmIzMWRjOTAxYzAyMWYxNjIwNzUuLmU2NGFiNDRiNjUx MGM4NjljNzUwNTJkOWM3MzQ2MGI1OTVlNzNlMDggMTAwNzU1Ci0tLSBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5weQor KysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0 ZXJjZmdfdW5pdHRlc3QucHkKQEAgLTMyOCw2ICszMjgsMjggQEAgVGVzdHMgdGhhdCB0aW1lZCBv dXQ6CiAiIiIpCiAKIAorY2xhc3MgQnVpbGRTdGVwc0NvbnN0cnVjdG9yVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CisgICAgIyAiUGFzc2luZyBhIEJ1aWxkU3RlcCBzdWJjbGFzcyB0byBmYWN0b3J5 LmFkZFN0ZXAgaXMgZGVwcmVjYXRlZC4gUGxlYXNlIHBhc3MgYSBCdWlsZFN0ZXAgaW5zdGFuY2Ug aW5zdGVhZC4gIFN1cHBvcnQgd2lsbCBiZSBkcm9wcGVkIGluIHYwLjguNy4iCisgICAgIyBJdCBj aGVja3MgaWYgYWxsIGJ1aWxkZXIncyBhbGwgYnVpbGRzdGVwcyBjYW4gYmUgaW5zYW50aWF0ZWQg YWZ0ZXIgbWlncmF0aW9uLgorICAgICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg5MDAxCisgICAgIyBodHRwOi8vYnVpbGRib3QubmV0L2J1aWxkYm90L2RvY3MvMC44 LjZwMS9tYW51YWwvY3VzdG9taXphdGlvbi5odG1sI3dyaXRpbmctYnVpbGRzdGVwLWNvbnN0cnVj dG9ycworCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBnZW5lcmF0ZVRlc3RzKCk6CisgICAg ICAgIGZvciBidWlsZGVyTnVtYmVyLCBidWlsZGVyIGluIGVudW1lcmF0ZShjWydidWlsZGVycydd KToKKyAgICAgICAgICAgIGZvciBzdGVwTnVtYmVyLCBzdGVwIGluIGVudW1lcmF0ZShidWlsZGVy WydmYWN0b3J5J10uc3RlcHMpOgorICAgICAgICAgICAgICAgIHNldGF0dHIoQnVpbGRTdGVwc0Nv bnN0cnVjdG9yVGVzdCwgJ3Rlc3RfYnVpbGRlciUwMmRfc3RlcCUwMmQnICUgKGJ1aWxkZXJOdW1i ZXIsIHN0ZXBOdW1iZXIpLCBCdWlsZFN0ZXBzQ29uc3RydWN0b3JUZXN0LmNyZWF0ZVRlc3QoYnVp bGRlciwgc3RlcCkpCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIGNyZWF0ZVRlc3QoYnVp bGRlciwgc3RlcCk6CisgICAgICAgIGRlZiBkb1Rlc3Qoc2VsZik6CisgICAgICAgICAgICB0cnk6 CisgICAgICAgICAgICAgICAgKGJ1aWxkU3RlcEZhY3RvcnksIGt3YXJncykgPSBzdGVwCisgICAg ICAgICAgICAgICAgYnVpbGRTdGVwRmFjdG9yeSgqKmt3YXJncykKKyAgICAgICAgICAgIGV4Y2Vw dCBUeXBlRXJyb3IgYXMgZToKKyAgICAgICAgICAgICAgICBidWlsZFN0ZXBOYW1lID0gc3RyKGJ1 aWxkU3RlcEZhY3RvcnkpLnNwbGl0KCcuJylbLTFdCisgICAgICAgICAgICAgICAgc2VsZi5mYWls KCJFcnJvciBkdXJpbmcgaW5zdGFudGlhdGlvbiAlcyBidWlsZHN0ZXAgZm9yICVzIGJ1aWxkZXI6 ICVzXG4iICUgKGJ1aWxkU3RlcE5hbWUsIGJ1aWxkZXJbJ25hbWUnXS5lbmNvZGUoJ2FzY2lpJywg J2lnbm9yZScpLCBlKSkKKyAgICAgICAgcmV0dXJuIGRvVGVzdAogCiAjIEZJWE1FOiBXZSBzaG91 bGQgcnVuIHRoaXMgZmlsZSBhcyBwYXJ0IG9mIHRlc3Qtd2Via2l0cHkuCiAjIFVuZm9ydHVuYXRl bHkgdGVzdC13ZWJraXRweSBjdXJyZW50bHkgcmVxdWlyZXMgdGhhdCB1bml0dGVzdHMKQEAgLTMz Niw0ICszNTgsNSBAQCBUZXN0cyB0aGF0IHRpbWVkIG91dDoKICMgc28gZm9yIG5vdyB0aGlzIGlz IGEgc3RhbmQtYWxvbmUgdGVzdCBoYXJuZXNzLgogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoK ICAgICBCdWlsZEJvdENvbmZpZ0xvYWRlcigpLmxvYWRfY29uZmlnKCdtYXN0ZXIuY2ZnJykKKyAg ICBCdWlsZFN0ZXBzQ29uc3RydWN0b3JUZXN0LmdlbmVyYXRlVGVzdHMoKQogICAgIHVuaXR0ZXN0 Lm1haW4oKQo= 148555 2012-06-20 06:41:47 -0700 2012-06-27 01:28:15 -0700 Patch bug-89564-20120620154146.patch text/plain 3023 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwODEyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzZmMWMzNGUwYzg1ODliNzNkM2I4NjJkMzNkYWMyOGY1 YTUyNGFhYS4uMmUyYjFlOTUzMWYwM2NlNjNkZTVkY2NkZmU1NGZhMWZiMmNkODhlZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA2LTIwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisK KyAgICAgICAgQWRkIG1hc3Rlci5jZmcgdW5pdHRlc3QgdG8gaGVscCBtaWdyYXRpb24gLSBwYXNz IEJ1aWxkU3RlcCBpbnN0YW5jZXMgaW5zdGVhZCBvZiBCdWlsZFN0ZXAgc3ViY2xhc3NlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk1NjQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5weToKKyAg ICAgICAgKEJ1aWxkU3RlcHNDb25zdHJ1Y3RvclRlc3QpOgorICAgICAgICAoQnVpbGRTdGVwc0Nv bnN0cnVjdG9yVGVzdC5nZW5lcmF0ZVRlc3RzKToKKyAgICAgICAgKEJ1aWxkU3RlcHNDb25zdHJ1 Y3RvclRlc3QuY3JlYXRlVGVzdCk6CisgICAgICAgIChCdWlsZFN0ZXBzQ29uc3RydWN0b3JUZXN0 LmNyZWF0ZVRlc3QuZG9UZXN0KToKKwogMjAxMi0wNi0xOSAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNo b2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF1bUmVncmVzc2lvbl0gQnVpbGQgYnJlYWsg YWZ0ZXIgcjEyMDc4NgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvbWFzdGVyY2ZnX3VuaXR0ZXN0LnB5IGIvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyY2ZnX3VuaXR0ZXN0LnB5Cmlu ZGV4IDEwMTQ1MWZjOTg0MDRmYzQ0NmE0ZmIzMWRjOTAxYzAyMWYxNjIwNzUuLjIwZGQ0MGMzYzJh YzYwODkzNjFhYzFhM2YzNWYxNWVmNWQ1OTVjYWQgMTAwNzU1Ci0tLSBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5weQor KysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0 ZXJjZmdfdW5pdHRlc3QucHkKQEAgLTMyOCw2ICszMjgsMjkgQEAgVGVzdHMgdGhhdCB0aW1lZCBv dXQ6CiAiIiIpCiAKIAorY2xhc3MgQnVpbGRTdGVwc0NvbnN0cnVjdG9yVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CisgICAgIyAiUGFzc2luZyBhIEJ1aWxkU3RlcCBzdWJjbGFzcyB0byBmYWN0b3J5 LmFkZFN0ZXAgaXMgZGVwcmVjYXRlZC4gUGxlYXNlIHBhc3MgYSBCdWlsZFN0ZXAgaW5zdGFuY2Ug aW5zdGVhZC4gIFN1cHBvcnQgd2lsbCBiZSBkcm9wcGVkIGluIHYwLjguNy4iCisgICAgIyBJdCBj aGVja3MgaWYgYWxsIGJ1aWxkZXIncyBhbGwgYnVpbGRzdGVwcyBjYW4gYmUgaW5zYW50aWF0ZWQg YWZ0ZXIgbWlncmF0aW9uLgorICAgICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg5MDAxCisgICAgIyBodHRwOi8vYnVpbGRib3QubmV0L2J1aWxkYm90L2RvY3MvMC44 LjZwMS9tYW51YWwvY3VzdG9taXphdGlvbi5odG1sI3dyaXRpbmctYnVpbGRzdGVwLWNvbnN0cnVj dG9ycworCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBnZW5lcmF0ZVRlc3RzKCk6CisgICAg ICAgIGZvciBidWlsZGVyTnVtYmVyLCBidWlsZGVyIGluIGVudW1lcmF0ZShjWydidWlsZGVycydd KToKKyAgICAgICAgICAgIGZvciBzdGVwTnVtYmVyLCBzdGVwIGluIGVudW1lcmF0ZShidWlsZGVy WydmYWN0b3J5J10uc3RlcHMpOgorICAgICAgICAgICAgICAgIGJ1aWxkZXJOYW1lID0gYnVpbGRl clsnbmFtZSddLmVuY29kZSgnYXNjaWknLCAnaWdub3JlJykKKyAgICAgICAgICAgICAgICBzZXRh dHRyKEJ1aWxkU3RlcHNDb25zdHJ1Y3RvclRlc3QsICd0ZXN0X2J1aWxkZXIlMDJkX3N0ZXAlMDJk JyAlIChidWlsZGVyTnVtYmVyLCBzdGVwTnVtYmVyKSwgQnVpbGRTdGVwc0NvbnN0cnVjdG9yVGVz dC5jcmVhdGVUZXN0KGJ1aWxkZXJOYW1lLCBzdGVwKSkKKworICAgIEBzdGF0aWNtZXRob2QKKyAg ICBkZWYgY3JlYXRlVGVzdChidWlsZGVyTmFtZSwgc3RlcCk6CisgICAgICAgIGRlZiBkb1Rlc3Qo c2VsZik6CisgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgKGJ1aWxkU3RlcEZhY3Rv cnksIGt3YXJncykgPSBzdGVwCisgICAgICAgICAgICAgICAgYnVpbGRTdGVwRmFjdG9yeSgqKmt3 YXJncykKKyAgICAgICAgICAgIGV4Y2VwdCBUeXBlRXJyb3IgYXMgZToKKyAgICAgICAgICAgICAg ICBidWlsZFN0ZXBOYW1lID0gc3RyKGJ1aWxkU3RlcEZhY3RvcnkpLnNwbGl0KCcuJylbLTFdCisg ICAgICAgICAgICAgICAgc2VsZi5mYWlsKCJFcnJvciBkdXJpbmcgaW5zdGFudGlhdGlvbiAlcyBi dWlsZHN0ZXAgZm9yICVzIGJ1aWxkZXI6ICVzXG4iICUgKGJ1aWxkU3RlcE5hbWUsIGJ1aWxkZXJO YW1lLCBlKSkKKyAgICAgICAgcmV0dXJuIGRvVGVzdAogCiAjIEZJWE1FOiBXZSBzaG91bGQgcnVu IHRoaXMgZmlsZSBhcyBwYXJ0IG9mIHRlc3Qtd2Via2l0cHkuCiAjIFVuZm9ydHVuYXRlbHkgdGVz dC13ZWJraXRweSBjdXJyZW50bHkgcmVxdWlyZXMgdGhhdCB1bml0dGVzdHMKQEAgLTMzNiw0ICsz NTksNSBAQCBUZXN0cyB0aGF0IHRpbWVkIG91dDoKICMgc28gZm9yIG5vdyB0aGlzIGlzIGEgc3Rh bmQtYWxvbmUgdGVzdCBoYXJuZXNzLgogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICBC dWlsZEJvdENvbmZpZ0xvYWRlcigpLmxvYWRfY29uZmlnKCdtYXN0ZXIuY2ZnJykKKyAgICBCdWls ZFN0ZXBzQ29uc3RydWN0b3JUZXN0LmdlbmVyYXRlVGVzdHMoKQogICAgIHVuaXR0ZXN0Lm1haW4o KQo=