mirror of
https://github.com/priyanshujain/sanderling.git
synced 2026-10-04 20:17:09 +00:00
feat(testrun): add iOS platform path (simctl launch + direct TCP)
This commit is contained in:
1 parent
615e0e4794
commit
0ffe9f0a25
1 file changed
+52
-10
+52
-10
@@ -8,11 +8,13 @@ import (
|
|||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/priyanshujain/sanderling/internal/agent"
|
"github.com/priyanshujain/sanderling/internal/agent"
|
||||||
"github.com/priyanshujain/sanderling/internal/android"
|
"github.com/priyanshujain/sanderling/internal/android"
|
||||||
"github.com/priyanshujain/sanderling/internal/bundler"
|
"github.com/priyanshujain/sanderling/internal/bundler"
|
||||||
|
"github.com/priyanshujain/sanderling/internal/ios"
|
||||||
"github.com/priyanshujain/sanderling/internal/runner"
|
"github.com/priyanshujain/sanderling/internal/runner"
|
||||||
"github.com/priyanshujain/sanderling/internal/trace"
|
"github.com/priyanshujain/sanderling/internal/trace"
|
||||||
"github.com/priyanshujain/sanderling/internal/verifier"
|
"github.com/priyanshujain/sanderling/internal/verifier"
|
||||||
@@ -26,21 +28,27 @@ const (
|
|||||||
|
|
||||||
// Options are the parameters for a single test pipeline run.
|
// Options are the parameters for a single test pipeline run.
|
||||||
type Options struct {
|
type Options struct {
|
||||||
Spec string
|
Spec string
|
||||||
BundleID string
|
BundleID string
|
||||||
Platform string
|
Platform string
|
||||||
AVD string
|
AVD string
|
||||||
Duration time.Duration
|
IosDevice string
|
||||||
Seed int64
|
Duration time.Duration
|
||||||
Output string
|
Seed int64
|
||||||
|
Output string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Execute runs the full test pipeline: bundle, connect SDK, verify properties.
|
// Execute runs the full test pipeline: bundle, connect SDK, verify properties.
|
||||||
func Execute(ctx context.Context, options Options, stdout io.Writer) error {
|
func Execute(ctx context.Context, options Options, stdout io.Writer) error {
|
||||||
if options.Platform == "android" || options.Platform == "ios" {
|
switch options.Platform {
|
||||||
|
case "android":
|
||||||
if err := android.EnsureDevice(ctx, options.AVD, stdout); err != nil {
|
if err := android.EnsureDevice(ctx, options.AVD, stdout); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
case "ios":
|
||||||
|
if err := ios.EnsureSimulator(ctx, options.IosDevice, stdout); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
aliases := map[string]string{}
|
aliases := map[string]string{}
|
||||||
if specAPIPath := resolveSpecAPIPath(options.Spec); specAPIPath != "" {
|
if specAPIPath := resolveSpecAPIPath(options.Spec); specAPIPath != "" {
|
||||||
@@ -69,7 +77,8 @@ func Execute(ctx context.Context, options Options, stdout io.Writer) error {
|
|||||||
|
|
||||||
var connection *agent.Conn
|
var connection *agent.Conn
|
||||||
|
|
||||||
if options.Platform != "web" {
|
switch options.Platform {
|
||||||
|
case "android":
|
||||||
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("agent listener: %w", err)
|
return fmt.Errorf("agent listener: %w", err)
|
||||||
@@ -114,7 +123,40 @@ func Execute(ctx context.Context, options Options, stdout io.Writer) error {
|
|||||||
defer connection.Close()
|
defer connection.Close()
|
||||||
hello := connection.Hello()
|
hello := connection.Hello()
|
||||||
fmt.Fprintf(stdout, "SDK connected: platform=%s app=%s sdk=%s\n", hello.Platform, hello.AppPackage, hello.Version)
|
fmt.Fprintf(stdout, "SDK connected: platform=%s app=%s sdk=%s\n", hello.Platform, hello.AppPackage, hello.Version)
|
||||||
} else {
|
|
||||||
|
case "ios":
|
||||||
|
// iOS simulator shares the Mac's loopback — no port forwarding needed.
|
||||||
|
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("agent listener: %w", err)
|
||||||
|
}
|
||||||
|
defer listener.Close()
|
||||||
|
agentPort := listener.Addr().(*net.TCPAddr).Port
|
||||||
|
|
||||||
|
// Start Maestro XCTest session, then re-launch via simctl to inject the port.
|
||||||
|
if err := activeDriver.Launch(ctx, options.BundleID, false); err != nil {
|
||||||
|
return fmt.Errorf("launch app (maestro): %w", err)
|
||||||
|
}
|
||||||
|
if err := ios.LaunchApp(ctx, options.BundleID, map[string]string{
|
||||||
|
"SANDERLING_PORT": strconv.Itoa(agentPort),
|
||||||
|
}); err != nil {
|
||||||
|
return fmt.Errorf("launch app (simctl): %w", err)
|
||||||
|
}
|
||||||
|
fmt.Fprintf(stdout, "iOS app launched with SANDERLING_PORT=%d; waiting for SDK (%.0fs timeout)\n", agentPort, sdkAcceptTimeout.Seconds())
|
||||||
|
|
||||||
|
agentServer := agent.NewServer(listener)
|
||||||
|
acceptCtx, acceptCancel := context.WithTimeout(ctx, sdkAcceptTimeout)
|
||||||
|
conn, acceptErr := agentServer.Accept(acceptCtx)
|
||||||
|
acceptCancel()
|
||||||
|
if acceptErr != nil {
|
||||||
|
return fmt.Errorf("accept SDK: %w", acceptErr)
|
||||||
|
}
|
||||||
|
connection = conn
|
||||||
|
defer connection.Close()
|
||||||
|
hello := connection.Hello()
|
||||||
|
fmt.Fprintf(stdout, "SDK connected: platform=%s app=%s sdk=%s\n", hello.Platform, hello.AppPackage, hello.Version)
|
||||||
|
|
||||||
|
case "web":
|
||||||
fmt.Fprintln(stdout, "web mode: skipping SDK")
|
fmt.Fprintln(stdout, "web mode: skipping SDK")
|
||||||
if err := activeDriver.Launch(ctx, options.BundleID, false); err != nil {
|
if err := activeDriver.Launch(ctx, options.BundleID, false); err != nil {
|
||||||
return fmt.Errorf("launch app: %w", err)
|
return fmt.Errorf("launch app: %w", err)
|
||||||
|
|||||||
Reference in new issue
Block a user