Skip to content

Commit

Permalink
If device is not connected, try opening with QuickTime to trigger it …
Browse files Browse the repository at this point in the history 
…to connect

Bug: flutter/flutter#141383
Change-Id: Ib161ef48b36b8790df6fe84b1ba9124cb43ed4e2
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/54460
Reviewed-by: Keyong Han <keyonghan@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Victoria Ashworth <vashworth@google.com>
  • Loading branch information
@vashworth
vashworth authored and CQ Bot Account committed Jan 25, 2024
1 parent 0c6d40d commit baeead2
Show file tree
Hide file tree
Showing 18 changed files with 2,378 additions and 1,210 deletions.
333 changes: 234 additions & 99 deletions recipe_modules/os_utils/api.py
View file

Large diffs are not rendered by default.

154 changes: 92 additions & 62 deletions recipe_modules/os_utils/examples/full.expected/clean_derived_data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
"java"
],
"infra_step": true,
"name": "Killing Processes.kill Safari (2)",
"name": "Killing Processes.kill java",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
Expand All @@ -214,7 +214,7 @@
"adb"
],
"infra_step": true,
"name": "Killing Processes.kill Safari (3)",
"name": "Killing Processes.kill adb",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
Expand All @@ -231,6 +231,18 @@
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"killall",
"-9",
"QuickTime Player"
],
"infra_step": true,
"name": "Killing Processes.kill QuickTime",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"top",
Expand Down Expand Up @@ -340,52 +352,11 @@
},
{
"cmd": [],
"name": "Prepare iOS device.Wait for device to connect",
"name": "Prepare iOS device.Checkout flutter/cocoon",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"xcrun",
"devicectl",
"list",
"devices",
"--filter",
"connectionProperties.transportType CONTAINS 'wired'",
"-v"
],
"name": "Prepare iOS device.Wait for device to connect.Find wired CoreDevices",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@raw_io.output_text@@@"
]
},
{
"cmd": [
"killall",
"-9",
"Xcode"
],
"name": "Prepare iOS device.Wait for device to connect.Kill Xcode",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [],
"name": "Prepare iOS device.Dismiss iOS dialogs",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [],
"name": "Prepare iOS device.Dismiss iOS dialogs.Checkout flutter/cocoon",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
"python3",
Expand All @@ -396,9 +367,9 @@
"--url",
"https://flutter.googlesource.com/mirrors/cocoon"
],
"name": "Prepare iOS device.Dismiss iOS dialogs.Checkout flutter/cocoon.git setup",
"name": "Prepare iOS device.Checkout flutter/cocoon.git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
Expand All @@ -416,9 +387,9 @@
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "Prepare iOS device.Dismiss iOS dialogs.Checkout flutter/cocoon.git fetch",
"name": "Prepare iOS device.Checkout flutter/cocoon.git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
Expand All @@ -430,9 +401,9 @@
],
"cwd": "[CACHE]/cocoon",
"infra_step": true,
"name": "Prepare iOS device.Dismiss iOS dialogs.Checkout flutter/cocoon.git checkout",
"name": "Prepare iOS device.Checkout flutter/cocoon.git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
Expand All @@ -443,9 +414,9 @@
],
"cwd": "[CACHE]/cocoon",
"infra_step": true,
"name": "Prepare iOS device.Dismiss iOS dialogs.Checkout flutter/cocoon.read revision",
"name": "Prepare iOS device.Checkout flutter/cocoon.read revision",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@",
"@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@"
]
Expand All @@ -460,9 +431,9 @@
],
"cwd": "[CACHE]/cocoon",
"infra_step": true,
"name": "Prepare iOS device.Dismiss iOS dialogs.Checkout flutter/cocoon.git clean",
"name": "Prepare iOS device.Checkout flutter/cocoon.git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
Expand All @@ -473,9 +444,9 @@
],
"cwd": "[CACHE]/cocoon",
"infra_step": true,
"name": "Prepare iOS device.Dismiss iOS dialogs.Checkout flutter/cocoon.submodule sync",
"name": "Prepare iOS device.Checkout flutter/cocoon.submodule sync",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
Expand All @@ -488,9 +459,39 @@
],
"cwd": "[CACHE]/cocoon",
"infra_step": true,
"name": "Prepare iOS device.Dismiss iOS dialogs.Checkout flutter/cocoon.submodule update",
"name": "Prepare iOS device.Checkout flutter/cocoon.submodule update",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@"
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [],
"name": "Prepare iOS device.Wait for device to connect",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
"cmd": [
"xcrun",
"devicectl",
"list",
"devices",
"--filter",
"connectionProperties.transportType CONTAINS 'wired'",
"-v"
],
"name": "Prepare iOS device.Wait for device to connect.Find wired CoreDevices",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@raw_io.output_text@@@"
]
},
{
"cmd": [],
"name": "Prepare iOS device.Dismiss iOS dialogs",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
Expand All @@ -517,6 +518,35 @@
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [
"xcrun",
"devicectl",
"list",
"devices",
"-v"
],
"cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"infra_step": true,
"name": "Prepare iOS device.Dismiss iOS dialogs.List CoreDevices",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@",
"@@@STEP_LOG_END@raw_io.output_text@@@"
]
},
{
"cmd": [
"killall",
"-9",
"QuickTime Player"
],
"cwd": "[CACHE]/cocoon/cipd_packages/device_doctor/tool/infra-dialog",
"infra_step": true,
"name": "Prepare iOS device.Dismiss iOS dialogs.Kill QuickTime",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@2@@@"
]
},
{
"cmd": [],
"name": "Prepare iOS device.Dismiss Xcode automation dialogs",
Expand Down Expand Up @@ -684,15 +714,15 @@
},
{
"cmd": [],
"name": "Reset Xcode automation dialogs"
"name": "Reset automation dialogs"
},
{
"cmd": [
"killall",
"-9",
"UserNotificationCenter"
],
"name": "Reset Xcode automation dialogs.Dismiss dialog",
"name": "Reset automation dialogs.Dismiss dialog",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
Expand All @@ -703,7 +733,7 @@
"Users/fakeuser/Library/Application Support/com.apple.TCC/TCC.db",
"SELECT service, client, client_type, auth_value, auth_reason, indirect_object_identifier_type, indirect_object_identifier, flags, last_modified FROM access WHERE service = \"kTCCServiceAppleEvents\""
],
"name": "Reset Xcode automation dialogs.Query TCC db",
"name": "Reset automation dialogs.Query TCC db",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_END@raw_io.output_text@@@"
Expand All @@ -715,7 +745,7 @@
"Users/fakeuser/Library/Application Support/com.apple.TCC"
],
"infra_step": true,
"name": "Reset Xcode automation dialogs.Find TCC directory",
"name": "Reset automation dialogs.Find TCC directory",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
Expand Down

0 comments on commit baeead2

Please sign in to comment.