Skip to content

Commit

Permalink
Update test runner
Browse files Browse the repository at this point in the history
- Add support for Xcode 11.

- Add --destination_timeout_sec in launch options.

- In subcommand `simulator_test`, change the argument --new_simulator_name to --new_simulator_name_prefix which will be used for simulator clean up feature.

- Delete simulator asynchronously.
  • Loading branch information
Albert Dai committed Jul 16, 2019
1 parent 1728770 commit 38b3447
Show file tree
Hide file tree
Showing 6 changed files with 155 additions and 121 deletions.
2 changes: 2 additions & 0 deletions xctestrunner/shared/ios_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ def enum(**enums):
this option does not work and the auto screenshot is enable by default.
startup_timeout_seconds: int
Seconds until the xcodebuild command is deemed stuck.
destination_timeout_sec: int
Wait for the given seconds while searching for the destination device.
""")

SIGNING_OPTIONS_JSON_HELP = (
Expand Down
13 changes: 9 additions & 4 deletions xctestrunner/simulator_control/simtype_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,16 @@ def profile_plist_obj(self):
else:
platform_path = xcode_info_util.GetSdkPlatformPath(
ios_constants.SDK.IPHONESIMULATOR)
if xcode_info_util.GetXcodeVersionNumber() >= 1100:
sim_profiles_dir = os.path.join(
platform_path, 'Library/Developer/CoreSimulator/Profiles')
else:
sim_profiles_dir = os.path.join(
platform_path, 'Developer/Library/CoreSimulator/Profiles')
profile_plist_path = os.path.join(
platform_path,
'Developer/Library/CoreSimulator/Profiles/DeviceTypes/'
'%s.simdevicetype/Contents/Resources/profile.plist'
% self._device_type)
sim_profiles_dir,
'DeviceTypes/%s.simdevicetype/Contents/Resources/profile.plist' %
self._device_type)
self._profile_plist_obj = plist_util.Plist(profile_plist_path)
return self._profile_plist_obj

Expand Down
Loading

0 comments on commit 38b3447

Please sign in to comment.