141365 2015-02-07 16:22:31 -0800 [iOS] run-webkit-tests fails due to simulator devices from previous SDK installs being marked as unavailable 2015-02-07 19:27:01 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 141358 1 ddkilzer ddkilzer ap commit-queue darin dbates ddkilzer glenn jake.nielsen.webkit oldest_to_newest 1067599 0 ddkilzer 2015-02-07 16:22:31 -0800 run-webkit-tests fails due to simulator devices from previous SDK installs being marked as unavailable: RuntimeError raised: Expected an iOS Simulator device line, got "-- Unavailable: com.apple.CoreSimulator.SimRuntime.iOS-8-0 --" Traceback (most recent call last): File "/Volumes/Data/WebKit.git/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 80, in main run_details = run(port, options, args, stderr) File "/Volumes/Data/WebKit.git/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 417, in run _set_up_derived_options(port, options) File "/Volumes/Data/WebKit.git/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 397, in _set_up_derived_options options.runtime = xcode.simulator.Simulator().latest_available_runtime File "/Volumes/Data/WebKit.git/Tools/Scripts/webkitpy/xcode/simulator.py", line 229, in __init__ self.refresh() File "/Volumes/Data/WebKit.git/Tools/Scripts/webkitpy/xcode/simulator.py", line 246, in refresh self._parse_device_types(lines) File "/Volumes/Data/WebKit.git/Tools/Scripts/webkitpy/xcode/simulator.py", line 265, in _parse_device_types self._parse_runtimes(lines) File "/Volumes/Data/WebKit.git/Tools/Scripts/webkitpy/xcode/simulator.py", line 286, in _parse_runtimes self._parse_devices(lines) File "/Volumes/Data/WebKit.git/Tools/Scripts/webkitpy/xcode/simulator.py", line 305, in _parse_devices raise RuntimeError('Expected an iOS Simulator device line, got "{}"'.format(line)) RuntimeError: Expected an iOS Simulator device line, got "-- Unavailable: com.apple.CoreSimulator.SimRuntime.iOS-8-0 --" 1067600 1 ddkilzer 2015-02-07 16:22:53 -0800 <rdar://problem/19636406> 1067606 2 246227 ddkilzer 2015-02-07 16:53:36 -0800 Created attachment 246227 Patch v1 1067609 3 246227 dbates 2015-02-07 17:13:17 -0800 Comment on attachment 246227 Patch v1 This patch is OK as-is. As remarked in a comment above class Simulator in this file, we may want consider parsing the device.plist files instead of parsing the simctl output, which seems more likely to change. 1067612 4 246227 dbates 2015-02-07 17:16:29 -0800 Comment on attachment 246227 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=246227&action=review > Tools/Scripts/webkitpy/xcode/simulator_unittest.py:230 > + self.assertEqual('com.apple.CoreSimulator.SimRuntime.iOS-8-0', runtime_ios_8.identifier) > + self.assertEqual(True, runtime_ios_8.available) > + self.assertEqual(False, runtime_ios_8.is_internal_runtime) > + self.assertEqual(tuple([8, 0]), runtime_ios_8.version) > + self.assertEqual(1, len(runtime_ios_8.devices)) I wish there was a better way to write this. One idea is to take advantage of Runtime's equality operator __eq__, construct a expected Runtime object and then perform self.assertEqual(expected_runtime, runtime_ios_8). We may want to add logic to Runtime.__eq__ to support checking the Runtime.is_internal_runtime, or even Runtime.available. 1067633 5 246227 commit-queue 2015-02-07 19:26:57 -0800 Comment on attachment 246227 Patch v1 Clearing flags on attachment: 246227 Committed r179793: <http://trac.webkit.org/changeset/179793> 1067634 6 commit-queue 2015-02-07 19:27:01 -0800 All reviewed patches have been landed. Closing bug. 246227 2015-02-07 16:53:36 -0800 2015-02-07 19:26:57 -0800 Patch v1 bug-141365-20150207165335.patch text/plain 6466 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5Nzg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGQ3OWU5YjliYzljMzEwNzkzNmVjNDA4ZDFjNDRkODQ3 ZjVjODFhNC4uNmE2ZDFiYWI0ZDgxOTc0MzBiNTQ4YTMxODM3M2Q2MzNlNTBjNDZmZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIy IEBACiAyMDE1LTAyLTA3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKKyAg ICAgICAgW2lPU10gcnVuLXdlYmtpdC10ZXN0cyBmYWlscyBkdWUgdG8gc2ltdWxhdG9yIGRldmlj ZXMgZnJvbSBwcmV2aW91cyBTREsgaW5zdGFsbHMgYmVpbmcgbWFya2VkIGFzIHVuYXZhaWxhYmxl CisgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzE0MTM2NT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkveGNvZGUv c2ltdWxhdG9yLnB5OgorICAgICAgICAoU2ltdWxhdG9yKTogQWRkIHVuYXZhaWxhYmxlX3ZlcnNp b25fcmUgcHJlY29tcGlsZWQgcmVnZXguCisgICAgICAgIChTaW11bGF0b3IuX3BhcnNlX2Rldmlj ZXMpOiBDaGVjayBmb3IgdW5hdmFpbGFibGUgdmVyc2lvbnMgYW5kCisgICAgICAgIGlnbm9yZSB0 aGVtIGlmIGZvdW5kIHdoZW4gcGFyc2luZyB0aGUgb3V0cHV0IG9mCisgICAgICAgIGB4Y3J1biBz aW1jdGwgbGlzdGAuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3Jf dW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X3VuYXZhaWxhYmxlX2RldmljZXMpOiBBZGQgdGVz dCB3aXRoIG91dHB1dCBmcm9tCisgICAgICAgIGB4Y3J1biBzaW1jdGwgbGlzdGAgd2l0aCB1bmF2 YWlsYWJsZSBydW50aW1lcyB0aGF0IGZhaWxzIGJlZm9yZQorICAgICAgICB0aGUgZml4LgorCisy MDE1LTAyLTA3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKICAgICAgICAg W2lPU10gTWFrZSBTaW11bGF0b3IgY2xhc3MgdGVzdGFibGUKICAgICAgICAgPGh0dHA6Ly93ZWJr aXQub3JnL2IvMTQxMzU4PgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hj b2RlL3NpbXVsYXRvci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdG9y LnB5CmluZGV4IGRkNzNhZTM2ZTMwZjA2NDg0OGVkNDkyZTNlYTBhMmMxMDIyY2U2MjMuLmQ0Yzlh MDc5MGJjM2JkMzE2NTNiMDVmMjA5ZTk4YTE2MGRkMDBjOWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdG9yLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkveGNvZGUvc2ltdWxhdG9yLnB5CkBAIC0yMzYsNiArMjM2LDcgQEAgY2xhc3MgU2ltdWxh dG9yKG9iamVjdCk6CiAgICAgZGV2aWNlX3R5cGVfcmUgPSByZS5jb21waWxlKCcoP1A8bmFtZT5b XihdKylcKCg/UDxpZGVudGlmaWVyPlteKV0rKVwpJykKICAgICBydW50aW1lX3JlID0gcmUuY29t cGlsZSgKICAgICAgICAgJ2lPUyAoP1A8dmVyc2lvbj5bMC05XStcLlswLTldKSg/UDxpbnRlcm5h bD4gSW50ZXJuYWwpPyBcKFswLTldK1wuWzAtOV0rIC0gKD9QPGJ1aWxkX3ZlcnNpb24+W14pXSsp XCkgXCgoP1A8aWRlbnRpZmllcj5bXildKylcKSggXCgoP1A8YXZhaWxhYmlsaXR5PlteKV0rKVwp KT8nKQorICAgIHVuYXZhaWxhYmxlX3ZlcnNpb25fcmUgPSByZS5jb21waWxlKCctLSBVbmF2YWls YWJsZTogKD9QPGlkZW50aWZpZXI+W14gXSspIC0tJykKICAgICB2ZXJzaW9uX3JlID0gcmUuY29t cGlsZSgnLS0gaU9TICg/UDx2ZXJzaW9uPlswLTldK1wuWzAtOV0rKSg/UDxpbnRlcm5hbD4gSW50 ZXJuYWwpPyAtLScpCiAgICAgZGV2aWNlc19yZSA9IHJlLmNvbXBpbGUoCiAgICAgICAgICdccyoo P1A8bmFtZT5bXihdKyApXCgoP1A8dWRpZD5bXildKylcKSBcKCg/UDxzdGF0ZT5bXildKylcKSgg XCgoP1A8YXZhaWxhYmlsaXR5PlteKV0rKVwpKT8nKQpAQCAtMzM3LDE0ICszMzgsMjEgQEAgY2xh c3MgU2ltdWxhdG9yKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgY3VycmVudF9ydW50aW1lID0g c2VsZi5ydW50aW1lKHZlcnNpb249dmVyc2lvbiwgaXNfaW50ZXJuYWxfcnVudGltZT1ib29sKHZl cnNpb25fbWF0Y2guZ3JvdXAoJ2ludGVybmFsJykpKQogICAgICAgICAgICAgICAgIGFzc2VydCBj dXJyZW50X3J1bnRpbWUKICAgICAgICAgICAgICAgICBjb250aW51ZQorCisgICAgICAgICAgICB1 bmF2YWlsYWJsZV92ZXJzaW9uX21hdGNoID0gc2VsZi51bmF2YWlsYWJsZV92ZXJzaW9uX3JlLm1h dGNoKGxpbmUpCisgICAgICAgICAgICBpZiB1bmF2YWlsYWJsZV92ZXJzaW9uX21hdGNoOgorICAg ICAgICAgICAgICAgIGN1cnJlbnRfcnVudGltZSA9IE5vbmUKKyAgICAgICAgICAgICAgICBjb250 aW51ZQorCiAgICAgICAgICAgICBkZXZpY2VfbWF0Y2ggPSBzZWxmLmRldmljZXNfcmUubWF0Y2go bGluZSkKICAgICAgICAgICAgIGlmIG5vdCBkZXZpY2VfbWF0Y2g6CiAgICAgICAgICAgICAgICAg cmFpc2UgUnVudGltZUVycm9yKCdFeHBlY3RlZCBhbiBpT1MgU2ltdWxhdG9yIGRldmljZSBsaW5l LCBnb3QgInt9IicuZm9ybWF0KGxpbmUpKQotICAgICAgICAgICAgZGV2aWNlID0gRGV2aWNlKG5h bWU9ZGV2aWNlX21hdGNoLmdyb3VwKCduYW1lJykucnN0cmlwKCksCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgdWRpZD1kZXZpY2VfbWF0Y2guZ3JvdXAoJ3VkaWQnKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBhdmFpbGFibGU9ZGV2aWNlX21hdGNoLmdyb3VwKCdhdmFpbGFiaWxp dHknKSBpcyBOb25lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1bnRpbWU9Y3VycmVu dF9ydW50aW1lKQotICAgICAgICAgICAgY3VycmVudF9ydW50aW1lLmRldmljZXMuYXBwZW5kKGRl dmljZSkKKyAgICAgICAgICAgIGlmIGN1cnJlbnRfcnVudGltZToKKyAgICAgICAgICAgICAgICBk ZXZpY2UgPSBEZXZpY2UobmFtZT1kZXZpY2VfbWF0Y2guZ3JvdXAoJ25hbWUnKS5yc3RyaXAoKSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWRpZD1kZXZpY2VfbWF0Y2guZ3JvdXAo J3VkaWQnKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXZhaWxhYmxlPWRldmlj ZV9tYXRjaC5ncm91cCgnYXZhaWxhYmlsaXR5JykgaXMgTm9uZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcnVudGltZT1jdXJyZW50X3J1bnRpbWUpCisgICAgICAgICAgICAgICAg Y3VycmVudF9ydW50aW1lLmRldmljZXMuYXBwZW5kKGRldmljZSkKIAogICAgIGRlZiBkZXZpY2Vf dHlwZShzZWxmLCBuYW1lPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSk6CiAgICAgICAgICIiIgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3JfdW5pdHRlc3Qu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvcl91bml0dGVzdC5weQpp bmRleCBiYTk4MjcxNGRiN2I1OGRjY2Y0NDliNzc3YjllNjE1ZWQ3ZmMyOTZhLi5jNDI1MDI0MWVi NzE5ZDU3NGExZTVhYmFjOGIzZDg0NzkxMDUyM2MzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvcl91bml0dGVzdC5weQpAQCAtMTk2LDMgKzE5Niw0OCBA QCBYWCBEZXZpY2VzIFhYCiAgICAgICAgIHdpdGggc2VsZi5hc3NlcnRSYWlzZXMoUnVudGltZUVy cm9yKSBhcyBjbToKICAgICAgICAgICAgIFNpbXVsYXRvcihob3N0PXNlbGYuX2hvc3QpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0V4cGVjdGVkID09IERldmljZXMgPT0gaGVhZGVyIGJ1dCBn b3Q6ICJYWCBEZXZpY2VzIFhYIicsIGNtLmV4Y2VwdGlvbi5tZXNzYWdlKQorCisgICAgZGVmIHRl c3RfdW5hdmFpbGFibGVfZGV2aWNlcyhzZWxmKToKKyAgICAgICAgIiIiIFRlc3RzIHRoYXQgdW5h dmFpbGFibGUgZGV2aWNlcyBhcmUgaWdub3JlZCAiIiIKKyAgICAgICAgc2VsZi5fc2V0X2V4cGVj dGVkX3hjcnVuX3NpbWN0bF9saXN0KCcnJz09IERldmljZSBUeXBlcyA9PQoraVBob25lIDRzIChj b20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBlLmlQaG9uZS00cykKKz09IFJ1bnRp bWVzID09CitpT1MgOC4wICg4LjAgLSAxMkE0NjUpIChjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5T aW1SdW50aW1lLmlPUy04LTApCitpT1MgOC4wIEludGVybmFsICg4LjAgLSBVbmtub3duKSAoY29t LmFwcGxlLkNvcmVTaW11bGF0b3IuU2ltUnVudGltZS5pT1MtOC0wLUludGVybmFsKSAodW5hdmFp bGFibGUsIHJ1bnRpbWUgcGF0aCBub3QgZm91bmQpCis9PSBEZXZpY2VzID09CistLSBpT1MgOC4w IC0tCisgICAgaVBob25lIDRzICgyNzFCQkVBQy0xODI2LTRDRTEtQjNBRi04M0YzNUNERDFEODIp IChTaHV0ZG93bikKKy0tIGlPUyA4LjAgSW50ZXJuYWwgLS0KKy0tIFVuYXZhaWxhYmxlOiBjb20u YXBwbGUuQ29yZVNpbXVsYXRvci5TaW1SdW50aW1lLmlPUy04LTEgLS0KKyAgICBpUGhvbmUgNHMg KDA4QzA1NDJCLTY1RjctNDZFOC1CMjAzLUNCNDA1NTIwN0JDOCkgKFNodXRkb3duKSAodW5hdmFp bGFibGUsIHJ1bnRpbWUgcHJvZmlsZSBub3QgZm91bmQpCistLSBVbmF2YWlsYWJsZTogY29tLmFw cGxlLkNvcmVTaW11bGF0b3IuU2ltUnVudGltZS5pT1MtOC0yIC0tCisgICAgaVBob25lIDRzIChB MzZGNzQzMi0wQUY1LTQ5QzQtQTI2MS1DNDQzODM5OTI1OTcpIChTaHV0ZG93bikgKHVuYXZhaWxh YmxlLCBydW50aW1lIHByb2ZpbGUgbm90IGZvdW5kKQorJycnKQorICAgICAgICBzaW11bGF0b3Ig PSBTaW11bGF0b3IoaG9zdD1zZWxmLl9ob3N0KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDEs IGxlbihzaW11bGF0b3IuZGV2aWNlX3R5cGVzKSkKKworICAgICAgICBkZXZpY2VfdHlwZV9pcGhv bmVfNHMgPSBzaW11bGF0b3IuZGV2aWNlX3R5cGVzWzBdCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoJ2lQaG9uZSA0cycsIGRldmljZV90eXBlX2lwaG9uZV80cy5uYW1lKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKCdjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBlLmlQaG9u ZS00cycsIGRldmljZV90eXBlX2lwaG9uZV80cy5pZGVudGlmaWVyKQorCisgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoMiwgbGVuKHNpbXVsYXRvci5ydW50aW1lcykpCisKKyAgICAgICAgcnVudGlt ZV9pb3NfOCA9IHNpbXVsYXRvci5ydW50aW1lc1swXQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KCdjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1SdW50aW1lLmlPUy04LTAnLCBydW50aW1lX2lv c184LmlkZW50aWZpZXIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVHJ1ZSwgcnVudGltZV9p b3NfOC5hdmFpbGFibGUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoRmFsc2UsIHJ1bnRpbWVf aW9zXzguaXNfaW50ZXJuYWxfcnVudGltZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh0dXBs ZShbOCwgMF0pLCBydW50aW1lX2lvc184LnZlcnNpb24pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoMSwgbGVuKHJ1bnRpbWVfaW9zXzguZGV2aWNlcykpCisKKyAgICAgICAgZGV2aWNlX2lwaG9u ZV80cyA9IHJ1bnRpbWVfaW9zXzguZGV2aWNlc1swXQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KCdpUGhvbmUgNHMnLCBkZXZpY2VfaXBob25lXzRzLm5hbWUpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoJzI3MUJCRUFDLTE4MjYtNENFMS1CM0FGLTgzRjM1Q0REMUQ4MicsIGRldmljZV9pcGhv bmVfNHMudWRpZCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChUcnVlLCBkZXZpY2VfaXBob25l XzRzLmF2YWlsYWJsZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChydW50aW1lX2lvc184LCBk ZXZpY2VfaXBob25lXzRzLnJ1bnRpbWUpCisKKyAgICAgICAgcnVudGltZV9pb3NfOF9pbnRlcm5h bCA9IHNpbXVsYXRvci5ydW50aW1lc1sxXQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdjb20u YXBwbGUuQ29yZVNpbXVsYXRvci5TaW1SdW50aW1lLmlPUy04LTAtSW50ZXJuYWwnLCBydW50aW1l X2lvc184X2ludGVybmFsLmlkZW50aWZpZXIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoRmFs c2UsIHJ1bnRpbWVfaW9zXzhfaW50ZXJuYWwuYXZhaWxhYmxlKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKFRydWUsIHJ1bnRpbWVfaW9zXzhfaW50ZXJuYWwuaXNfaW50ZXJuYWxfcnVudGltZSkK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh0dXBsZShbOCwgMF0pLCBydW50aW1lX2lvc184X2lu dGVybmFsLnZlcnNpb24pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwgbGVuKHJ1bnRpbWVf aW9zXzhfaW50ZXJuYWwuZGV2aWNlcykpCg==