Skip to content

Fix flaky test by using slice for stable iteration #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2021
Merged

Fix flaky test by using slice for stable iteration #438

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions internal/campaigns/workspace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,53 +12,57 @@ func TestBestWorkspaceCreator(t *testing.T) {
ctx := context.Background()
isOverridden := !(runtime.GOOS == "darwin" && runtime.GOARCH == "amd64")

type imageBehaviour struct {
image string
behaviour expect.Behaviour
}
for name, tc := range map[string]struct {
behaviours map[string]expect.Behaviour
behaviours []imageBehaviour
want workspaceCreatorType
}{
"nil steps": {
behaviours: nil,
want: workspaceCreatorVolume,
},
"no steps": {
behaviours: map[string]expect.Behaviour{},
behaviours: []imageBehaviour{},
want: workspaceCreatorVolume,
},
"root": {
behaviours: map[string]expect.Behaviour{
"foo": {Stdout: []byte("0\n")},
"bar": {Stdout: []byte("0\n")},
behaviours: []imageBehaviour{
{image: "foo", behaviour: expect.Behaviour{Stdout: []byte("0\n")}},
{image: "bar", behaviour: expect.Behaviour{Stdout: []byte("0\n")}},
},
want: workspaceCreatorVolume,
},
"same user": {
behaviours: map[string]expect.Behaviour{
"foo": {Stdout: []byte("1000\n")},
behaviours: []imageBehaviour{
{image: "foo", behaviour: expect.Behaviour{Stdout: []byte("1000\n")}},
},
want: workspaceCreatorBind,
},
"different user": {
behaviours: map[string]expect.Behaviour{
"foo": {Stdout: []byte("0\n")},
"bar": {Stdout: []byte("1000\n")},
behaviours: []imageBehaviour{
{image: "foo", behaviour: expect.Behaviour{Stdout: []byte("0\n")}},
{image: "bar", behaviour: expect.Behaviour{Stdout: []byte("1000\n")}},
},
want: workspaceCreatorBind,
},
"invalid id output: string": {
behaviours: map[string]expect.Behaviour{
"foo": {Stdout: []byte("xxx\n")},
behaviours: []imageBehaviour{
{image: "foo", behaviour: expect.Behaviour{Stdout: []byte("xxx\n")}},
},
want: workspaceCreatorBind,
},
"invalid id output: empty": {
behaviours: map[string]expect.Behaviour{
"foo": {Stdout: []byte("")},
behaviours: []imageBehaviour{
{image: "foo", behaviour: expect.Behaviour{Stdout: []byte("")}},
},
want: workspaceCreatorBind,
},
"error invoking id": {
behaviours: map[string]expect.Behaviour{
"foo": {ExitCode: 1},
behaviours: []imageBehaviour{
{image: "foo", behaviour: expect.Behaviour{ExitCode: 1}},
},
want: workspaceCreatorBind,
},
Expand All @@ -71,13 +75,13 @@ func TestBestWorkspaceCreator(t *testing.T) {
if tc.behaviours != nil {
commands = []*expect.Expectation{}
steps = []Step{}
for image, behaviour := range tc.behaviours {
for _, imageBehaviour := range tc.behaviours {
commands = append(commands, expect.NewGlob(
behaviour,
imageBehaviour.behaviour,
"docker", "run", "--rm", "--entrypoint", "/bin/sh",
image, "-c", "id -u",
imageBehaviour.image, "-c", "id -u",
))
steps = append(steps, Step{image: image})
steps = append(steps, Step{image: imageBehaviour.image})
}
}

Expand Down