diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-04-19 10:19:32 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-04-19 10:19:32 +0200 |
| commit | df20609d9e00a1413d6f2aa8a166207e1afdf2d8 (patch) | |
| tree | 9dbf05e6d5ad8db035064a71a6fdacbc2b5578b5 /scripts/Util.py | |
| parent | minor fix for UWP controller deployment (diff) | |
| download | ice-df20609d9e00a1413d6f2aa8a166207e1afdf2d8.tar.bz2 ice-df20609d9e00a1413d6f2aa8a166207e1afdf2d8.tar.xz ice-df20609d9e00a1413d6f2aa8a166207e1afdf2d8.zip | |
Fixed test script to be less picky on the simulator runtime version and typo in exception handling
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 34bc5b5e0ca..f43b1f7530a 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1750,7 +1750,7 @@ class RemoteProcessController(ProcessController): import Ice try: result = self.proxy.waitSuccess(timeout) - except Ice.LocaException: + except Ice.LocalException: raise except: raise Expect.TIMEOUT("waitSuccess timeout") @@ -1904,7 +1904,14 @@ class iOSSimulatorProcessController(RemoteProcessController): device = "iOSSimulatorProcessController" deviceID = "com.apple.CoreSimulator.SimDeviceType.iPhone-6" - runtimeID = "com.apple.CoreSimulator.SimRuntime.iOS-10-3" + # Pick the last iOS simulator runtime ID in the list of iOS simulators (assumed to be the latest). + runtimeID = None + for r in run("xcrun simctl list runtimes").split('\n'): + m = re.search("iOS .* \(.*\) \((.*)\)", r) + if m: + runtimeID = m.group(1) + if not runtimeID: + runtimeID = "com.apple.CoreSimulator.SimRuntime.iOS-10-3" # Default value appPath = "ios/controller/build" def __init__(self, current): |