diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-08-23 14:35:44 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2023-08-23 14:35:44 +0200 |
| commit | 3954f37920e4acb4fdec0c0d118c0e0a6a645491 (patch) | |
| tree | 3f580582e44def5314cef325f9afa218ebc4135d /client/go/internal/cli | |
| parent | ba88ba050dc729f0405df6386aa731eb5dc50502 (diff) | |
Include whether wait was aborted in error
Diffstat (limited to 'client/go/internal/cli')
| -rw-r--r-- | client/go/internal/cli/cmd/status_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/client/go/internal/cli/cmd/status_test.go b/client/go/internal/cli/cmd/status_test.go index 36f51ff5073..4ed13a7ef22 100644 --- a/client/go/internal/cli/cmd/status_test.go +++ b/client/go/internal/cli/cmd/status_test.go @@ -96,13 +96,13 @@ func TestStatusLocalDeployment(t *testing.T) { resp.Body = []byte(`{"currentGeneration": 42, "converged": false}`) client.NextResponse(resp) assert.NotNil(t, cli.Run("status", "deployment")) - assert.Equal(t, "Error: deployment not converged on latest generation after waiting 0s: wait timed out\n", stderr.String()) + assert.Equal(t, "Error: deployment not converged on latest generation: wait timed out\n", stderr.String()) // Explicit generation stderr.Reset() client.NextResponse(resp) assert.NotNil(t, cli.Run("status", "deployment", "41")) - assert.Equal(t, "Error: deployment not converged on generation 41 after waiting 0s: wait timed out\n", stderr.String()) + assert.Equal(t, "Error: deployment not converged on generation 41: wait timed out\n", stderr.String()) } func TestStatusCloudDeployment(t *testing.T) { @@ -131,14 +131,14 @@ func TestStatusCloudDeployment(t *testing.T) { assert.Equal(t, "Deployment run 1337 has completed\nSee https://console.vespa-cloud.com/tenant/t1/application/a1/dev/instance/i1/job/dev-us-north-1/run/1337 for more details\n", stdout.String()) - // Explicit run + // Explicit run with waiting client.NextResponse(mock.HTTPResponse{ URI: "/application/v4/tenant/t1/application/a1/instance/i1/job/dev-us-north-1/run/42?after=-1", Status: 200, Body: []byte(`{"active": false, "status": "failure"}`), }) - assert.NotNil(t, cli.Run("status", "deployment", "42")) - assert.Equal(t, "Error: deployment run 42 incomplete after waiting 0s: run 42 ended with unsuccessful status: failure\n", stderr.String()) + assert.NotNil(t, cli.Run("status", "deployment", "42", "-w", "10")) + assert.Equal(t, "Waiting up to 10s for deployment to converge...\nError: deployment run 42 incomplete after waiting up to 10s: aborting wait: run 42 ended with unsuccessful status: failure\n", stderr.String()) } func isLocalTarget(args []string) bool { |