Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(pkger): fix flaky test caused by merge race condition (#18594) 

one PR got merged, then the other without rebase/rerunning tests. That
is what resulted in this broken test.
pull/18564/head
Johnny Steenbergen 2020-06-18 06:10:27 -07:00 committed by GitHub
parent a4ce371c19
commit d1f9807624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/influxd/launcher/pkger_test.go
View File

@ -346,7 +346,8 @@ func TestLauncher_Pkger(t *testing.T) {
}) })
t.Run("that has already been deleted should be successful", func(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 }{ err := svc.DeleteStack(ctx, struct{ OrgID, UserID, StackID influxdb.ID }{
OrgID: l.Org.ID, OrgID: l.Org.ID,
@ -1539,11 +1540,7 @@ func TestLauncher_Pkger(t *testing.T) {
t.Run("apply with actions", func(t *testing.T) { t.Run("apply with actions", func(t *testing.T) {
stack, cleanup := newStackFn(t, pkger.Stack{}) stack, cleanup := newStackFn(t, pkger.Stack{})
defer func() { defer cleanup()
if t.Failed() {
cleanup()
}
}()
var ( var (
bucketPkgName = "rucketeer-1" bucketPkgName = "rucketeer-1"