mirror of
https://github.com/priyanshujain/sanderling.git
synced 2026-10-02 19:17:10 +00:00
fix(merge): resolve conflicts from master; keep WDA warmup + real healthy() check
This commit is contained in:
commit
f0a5abd767
4 files changed
+7
-17
No files matched your search
+4
-7
@@ -55,15 +55,12 @@ func EnsureSimulator(ctx context.Context, deviceName string, stdout io.Writer) e
|
||||
}
|
||||
|
||||
// BootedUDID returns the UDID of the currently booted iOS simulator, or "" if none is booted.
|
||||
func BootedUDID(ctx context.Context) (string, error) {
|
||||
d, err := bootedSimulator(ctx)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
func BootedUDID(ctx context.Context) string {
|
||||
d, _ := bootedSimulator(ctx)
|
||||
if d == nil {
|
||||
return "", nil
|
||||
return ""
|
||||
}
|
||||
return d.UDID, nil
|
||||
return d.UDID
|
||||
}
|
||||
|
||||
func bootedSimulator(ctx context.Context) (*simDevice, error) {
|
||||
|
||||
@@ -82,10 +82,7 @@ func TestPickSimulator_EmptyList(t *testing.T) {
|
||||
func TestBootedUDID_CanceledContext(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel()
|
||||
udid, err := BootedUDID(ctx)
|
||||
if err == nil {
|
||||
t.Error("expected error for canceled context, got nil")
|
||||
}
|
||||
udid := BootedUDID(ctx)
|
||||
if udid != "" {
|
||||
t.Errorf("expected empty UDID on canceled context, got %q", udid)
|
||||
}
|
||||
|
||||
@@ -41,11 +41,7 @@ func buildDriver(ctx context.Context, options Options, stdout io.Writer) (driver
|
||||
"--platform", options.Platform,
|
||||
}
|
||||
if options.Platform == "ios" {
|
||||
udid, err := ios.BootedUDID(ctx)
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("find booted simulator: %w", err)
|
||||
}
|
||||
if udid != "" {
|
||||
if udid := ios.BootedUDID(ctx); udid != "" {
|
||||
sidecarArgs = append(sidecarArgs, "--udid", udid)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user