Commitd244d35

authored

Allow integration tests to pass on fresh deployments (#131)

1 parentbf9a6ae commitd244d35Copy full SHA for d244d35

File tree

+21

-6

lines changed

+21

-6

lines changed

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,29 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`"cdr.dev/coder-cli/ci/tcli"`
	`8`	`+"cdr.dev/coder-cli/coder-sdk"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`funcTestSSH(t*testing.T) {`
`11`	`12`	`t.Parallel()`
`12`	`13`	`run(t,"ssh-coder-cli-tests",func(ttesting.T,ctx context.Context,ctcli.ContainerRunner) {`
`13`	`14`	`headlessLogin(ctx,t,c)`
`14`		`-c.Run(ctx,"coder config-ssh").Assert(t,`
	`15`	`+`
	`16`	`+// TODO remove this once we can create an environment if there aren't any`
	`17`	`+varenvs []coder.Environment`
	`18`	`+c.Run(ctx,"coder envs ls --output json").Assert(t,`
`15`	`19`	`tcli.Success(),`
	`20`	`+tcli.StdoutJSONUnmarshal(&envs),`
	`21`	`+)`
	`22`	`+`
	`23`	`+assert:=tcli.Success()`
	`24`	`+`
	`25`	`+// if we don't have any environments, "coder config-ssh" will fail`
	`26`	`+iflen(envs)==0 {`
	`27`	`+assert=tcli.Error()`
	`28`	`+}`
	`29`	`+c.Run(ctx,"coder config-ssh").Assert(t,`
	`30`	`+assert,`
`16`	`31`	`)`
`17`	`32`	`})`
`18`	`33`	`}`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,16 +21,16 @@ func TestUsers(t *testing.T) {`
`21`	`21`	`headlessLogin(ctx,t,c)`
`22`	`22`
`23`	`23`	`varuser coder.User`
`24`		-c.Run(ctx,`coder users ls --output json \| jq -c '.[] \| select( .username == "charlie")'`).Assert(t,
	`24`	+c.Run(ctx,`coder users ls --output json \| jq -c '.[] \| select( .username == "admin")'`).Assert(t,
`25`	`25`	`tcli.Success(),`
`26`	`26`	`tcli.StdoutJSONUnmarshal(&user),`
`27`	`27`	`)`
`28`		`-assert.Equal(t,"user email is as expected","charlie@coder.com",user.Email)`
`29`		`-assert.Equal(t,"username is as expected","Charlie",user.Name)`
	`28`	`+assert.Equal(t,"user email is as expected","admin",user.Email)`
	`29`	`+assert.Equal(t,"name is as expected","admin",user.Name)`
`30`	`30`
`31`		`-c.Run(ctx,"coder users ls --output human \| grepcharlie").Assert(t,`
	`31`	`+c.Run(ctx,"coder users ls --output human \| grepadmin").Assert(t,`
`32`	`32`	`tcli.Success(),`
`33`		`-tcli.StdoutMatches("charlie"),`
	`33`	`+tcli.StdoutMatches("admin"),`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`c.Run(ctx,"coder logout").Assert(t,`

Comments

(0)