diff --git a/pkg/driver/devicelab_ios/lifecycle.go b/pkg/driver/devicelab_ios/lifecycle.go index f581a926..3e4b5cda 100644 --- a/pkg/driver/devicelab_ios/lifecycle.go +++ b/pkg/driver/devicelab_ios/lifecycle.go @@ -82,10 +82,12 @@ func (d *Driver) launchApp(s *flow.LaunchAppStep) *core.CommandResult { return res } } - d.applyLaunchPermissions(bid, s.Permissions) - if s.ClearKeychain { - if _, err := d.runSimctl("keychain", d.udid, "reset"); err != nil { - logger.Warn("launchApp: clearKeychain skipped: %v", err) + if !keepsRunningApp(s) { + d.applyLaunchPermissions(bid, s.Permissions) + if s.ClearKeychain { + if _, err := d.runSimctl("keychain", d.udid, "reset"); err != nil { + logger.Warn("launchApp: clearKeychain skipped: %v", err) + } } } args := []string{"launch", "--terminate-running-process", d.udid, bid} diff --git a/pkg/driver/devicelab_ios/lifecycle_test.go b/pkg/driver/devicelab_ios/lifecycle_test.go index 5fbb2a29..e8dfa81e 100644 --- a/pkg/driver/devicelab_ios/lifecycle_test.go +++ b/pkg/driver/devicelab_ios/lifecycle_test.go @@ -65,7 +65,7 @@ func TestLaunchAppDefaultsAndErrors(t *testing.T) { if res := d.Execute(&flow.LaunchAppStep{}); res.Success { t.Fatal("no app id should fail") } - res := d.Execute(&flow.LaunchAppStep{AppID: "com.x", StopApp: boolp(false)}) + res := d.Execute(&flow.LaunchAppStep{AppID: "com.x"}) if res.Success { t.Fatal("launch error should fail") } @@ -76,9 +76,6 @@ func TestLaunchAppDefaultsAndErrors(t *testing.T) { if sl.has("privacy SIM-1 reset") { t.Fatalf("default all:allow must not reset permissions: %v", sl.calls) } - if sl.has("terminate") { - t.Fatal("stopApp: false must not terminate") - } } // stopApp: false launches without --terminate-running-process: Maestro's