Skip to content

Commit

Permalink
fix(pkger): fix flaky test caused by merge race condition (#18594)
Browse files Browse the repository at this point in the history
one PR got merged, then the other without rebase/rerunning tests. That
is what resulted in this broken test.
  • Loading branch information
jsteenb2 authored Jun 18, 2020
1 parent a4ce371 commit d1f9807
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions cmd/influxd/launcher/pkger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,8 @@ func TestLauncher_Pkger(t *testing.T) {
})

t.Run("that has already been deleted should be successful", func(t *testing.T) {
newStack, _ := newStackFn(t, pkger.Stack{})
newStack, cleanup := newStackFn(t, pkger.Stack{})
defer cleanup()

err := svc.DeleteStack(ctx, struct{ OrgID, UserID, StackID influxdb.ID }{
OrgID: l.Org.ID,
Expand Down Expand Up @@ -1539,11 +1540,7 @@ func TestLauncher_Pkger(t *testing.T) {

t.Run("apply with actions", func(t *testing.T) {
stack, cleanup := newStackFn(t, pkger.Stack{})
defer func() {
if t.Failed() {
cleanup()
}
}()
defer cleanup()

var (
bucketPkgName = "rucketeer-1"
Expand Down

0 comments on commit d1f9807

Please sign in to comment.