test(e2e): remove -o json flag (non-TTY auto-detects json)

Author: pratikbin

test/e2e/helpers_test.go

@@ -141,7 +141,7 @@ func newSandbox(t *testing.T, extraArgs ...string) SandboxView { //nolint:unused
 	safeName := sanitiseName(t.Name())
 	name := fmt.Sprintf("e2e-%s-%s", runID, safeName)
 
-	args := []string{"sandbox", "create", "-o", "json", "--name", name}
+	args := []string{"sandbox", "create", "--name", name}
 	if testShape != "" {
 		args = append(args, "--shape", testShape)
 	}
@@ -178,7 +178,7 @@ func newSandbox(t *testing.T, extraArgs ...string) SandboxView { //nolint:unused
 
 	waitRunning(t, id)
 
-	getOut, getErr, getCode := runCLI("sandbox", "get", "-o", "json", id)
+	getOut, getErr, getCode := runCLI("sandbox", "get", id)
 	if getCode != 0 {
 		t.Fatalf("sandbox get failed after create (exit %d)\nstdout: %s\nstderr: %s", getCode, getOut, getErr)
 	}
@@ -193,7 +193,7 @@ func waitRunning(t *testing.T, id string) { //nolint:unused // called by newSand
 	deadline := time.Now().Add(waitRunningCap)
 	var lastStatus string
 	for time.Now().Before(deadline) {
-		stdout, _, code := runCLI("sandbox", "get", "-o", "json", id)
+		stdout, _, code := runCLI("sandbox", "get", id)
 		if code == 0 {
 			var view struct {
 				Status string `json:"status"`

test/e2e/lifecycle_test.go

@@ -18,7 +18,7 @@ func TestLifecycle(t *testing.T) {
 	// Step 2: Get — verify the sandbox is reachable and fields match.
 	getCtx, getCancel := context.WithTimeout(context.Background(), defaultTimeout)
 	defer getCancel()
-	getOut, getErr, getCode := runCLICtx(getCtx, "sandbox", "get", "-o", "json", sb.ID)
+	getOut, getErr, getCode := runCLICtx(getCtx, "sandbox", "get", sb.ID)
 	if getCode != 0 {
 		t.Fatalf("sandbox get failed (exit %d)\nstdout: %s\nstderr: %s", getCode, getOut, getErr)
 	}
@@ -36,7 +36,7 @@ func TestLifecycle(t *testing.T) {
 	// Step 3: Edit — set auto-pause to 30m (1800 seconds).
 	editCtx, editCancel := context.WithTimeout(context.Background(), defaultTimeout)
 	defer editCancel()
-	editOut, editErr, editCode := runCLICtx(editCtx, "sandbox", "edit", sb.ID, "--auto-pause", "30m", "-o", "json")
+	editOut, editErr, editCode := runCLICtx(editCtx, "sandbox", "edit", sb.ID, "--auto-pause", "30m")
 	if editCode != 0 {
 		t.Fatalf("sandbox edit failed (exit %d)\nstdout: %s\nstderr: %s", editCode, editOut, editErr)
 	}
@@ -51,7 +51,7 @@ func TestLifecycle(t *testing.T) {
 	// Step 4: Pause — command polls internally and renders JSON when not on TTY.
 	pauseCtx, pauseCancel := context.WithTimeout(context.Background(), createTimeout)
 	defer pauseCancel()
-	pauseOut, pauseErr, pauseCode := runCLICtx(pauseCtx, "sandbox", "pause", sb.ID, "-o", "json")
+	pauseOut, pauseErr, pauseCode := runCLICtx(pauseCtx, "sandbox", "pause", sb.ID)
 	if pauseCode != 0 {
 		t.Fatalf("sandbox pause failed (exit %d)\nstdout: %s\nstderr: %s", pauseCode, pauseOut, pauseErr)
 	}
@@ -63,7 +63,7 @@ func TestLifecycle(t *testing.T) {
 	// Step 5: Resume — command polls internally and renders JSON when not on TTY.
 	resumeCtx, resumeCancel := context.WithTimeout(context.Background(), createTimeout)
 	defer resumeCancel()
-	resumeOut, resumeErr, resumeCode := runCLICtx(resumeCtx, "sandbox", "resume", sb.ID, "-o", "json")
+	resumeOut, resumeErr, resumeCode := runCLICtx(resumeCtx, "sandbox", "resume", sb.ID)
 	if resumeCode != 0 {
 		t.Fatalf("sandbox resume failed (exit %d)\nstdout: %s\nstderr: %s", resumeCode, resumeOut, resumeErr)
 	}
@@ -78,7 +78,7 @@ func TestLifecycle(t *testing.T) {
 	_ = forkName // no --name flag; kept for tracing only
 	forkCtx, forkCancel := context.WithTimeout(context.Background(), createTimeout)
 	defer forkCancel()
-	forkOut, forkErr, forkCode := runCLICtx(forkCtx, "sandbox", "fork", sb.ID, "-o", "json")
+	forkOut, forkErr, forkCode := runCLICtx(forkCtx, "sandbox", "fork", sb.ID)
 	if forkCode != 0 {
 		t.Fatalf("sandbox fork failed (exit %d)\nstdout: %s\nstderr: %s", forkCode, forkOut, forkErr)
 	}
@@ -103,7 +103,7 @@ func TestLifecycle(t *testing.T) {
 	// Verify removal: get should fail with a non-zero exit (404).
 	verCtx, verCancel := context.WithTimeout(context.Background(), defaultTimeout)
 	defer verCancel()
-	_, _, verCode := runCLICtx(verCtx, "sandbox", "get", "-o", "json", sb.ID)
+	_, _, verCode := runCLICtx(verCtx, "sandbox", "get", sb.ID)
 	if verCode == 0 {
 		t.Errorf("expected non-zero exit after rm, but sandbox get succeeded for %q", sb.ID)
 	}

test/e2e/main_test.go

@@ -87,7 +87,7 @@ func TestMain(m *testing.M) {
 // with the lowest vcpu+mem_mib sum. Falls back to empty string on any error
 // so create calls get the server's default.
 func discoverSmallestShape() string {
-	stdout, _, code := runCLI("sandbox", "shapes", "-o", "json")
+	stdout, _, code := runCLI("sandbox", "shapes")
 	if code != 0 || strings.TrimSpace(stdout) == "" {
 		return ""
 	}
@@ -115,7 +115,7 @@ func discoverSmallestShape() string {
 
 // presweep deletes any existing sandboxes whose names start with "e2e-".
 func presweep() {
-	stdout, _, code := runCLI("sandbox", "list", "-o", "json", "--all")
+	stdout, _, code := runCLI("sandbox", "list", "--all")
 	if code != 0 || strings.TrimSpace(stdout) == "" {
 		return
 	}
@@ -139,7 +139,7 @@ func presweep() {
 
 // postsweep is deferred in TestMain; best-effort delete of e2e- sandboxes.
 func postsweep() {
-	stdout, _, code := runCLI("sandbox", "list", "-o", "json", "--all")
+	stdout, _, code := runCLI("sandbox", "list", "--all")
 	if code != 0 || strings.TrimSpace(stdout) == "" {
 		return
 	}

test/e2e/readonly_test.go

@@ -19,7 +19,7 @@ type ShapeView struct {
 // TestShapes asserts that `sandbox shapes -o json` returns a non-empty list
 // of shapes with expected fields populated.
 func TestShapes(t *testing.T) {
-	stdout, stderr, code := runCLI("sandbox", "shapes", "-o", "json")
+	stdout, stderr, code := runCLI("sandbox", "shapes")
 	if code != 0 {
 		t.Fatalf("sandbox shapes exited %d\nstdout: %s\nstderr: %s", code, stdout, stderr)
 	}
@@ -44,7 +44,7 @@ func TestShapes(t *testing.T) {
 // TestCatalog asserts that `sandbox catalog -o json` exits 0 and returns a
 // non-empty JSON array where the first item has a recognisable key.
 func TestCatalog(t *testing.T) {
-	stdout, stderr, code := runCLI("sandbox", "catalog", "-o", "json")
+	stdout, stderr, code := runCLI("sandbox", "catalog")
 	if code != 0 {
 		t.Fatalf("sandbox catalog exited %d\nstdout: %s\nstderr: %s", code, stdout, stderr)
 	}
@@ -68,7 +68,7 @@ func TestCatalog(t *testing.T) {
 // TestRootfs asserts that `sandbox rootfs -o json` exits 0 and returns a
 // non-nil, non-empty JSON value.
 func TestRootfs(t *testing.T) {
-	stdout, stderr, code := runCLI("sandbox", "rootfs", "-o", "json")
+	stdout, stderr, code := runCLI("sandbox", "rootfs")
 	if code != 0 {
 		t.Fatalf("sandbox rootfs exited %d\nstdout: %s\nstderr: %s", code, stdout, stderr)
 	}
@@ -96,7 +96,7 @@ func TestRootfs(t *testing.T) {
 // TestTemplateList asserts that `sandbox template list -o json` exits 0 and
 // returns valid JSON (empty or non-empty slice).
 func TestTemplateList(t *testing.T) {
-	stdout, stderr, code := runCLI("sandbox", "template", "list", "-o", "json")
+	stdout, stderr, code := runCLI("sandbox", "template", "list")
 	if code != 0 {
 		t.Fatalf("sandbox template list exited %d\nstdout: %s\nstderr: %s", code, stdout, stderr)
 	}
@@ -111,7 +111,7 @@ func TestTemplateList(t *testing.T) {
 // TestList asserts that `sandbox list -o json` exits 0 and returns valid JSON.
 // An empty slice is acceptable since the account may have no sandboxes.
 func TestList(t *testing.T) {
-	stdout, stderr, code := runCLI("sandbox", "list", "-o", "json")
+	stdout, stderr, code := runCLI("sandbox", "list")
 	if code != 0 {
 		t.Fatalf("sandbox list exited %d\nstdout: %s\nstderr: %s", code, stdout, stderr)
 	}
@@ -124,7 +124,7 @@ func TestList(t *testing.T) {
 func TestGet(t *testing.T) {
 	sb := newSandbox(t)
 
-	stdout, stderr, code := runCLI("sandbox", "get", "-o", "json", sb.ID)
+	stdout, stderr, code := runCLI("sandbox", "get", sb.ID)
 	if code != 0 {
 		t.Fatalf("sandbox get exited %d\nstdout: %s\nstderr: %s", code, stdout, stderr)
 	}