Skip to content

Commit

Permalink
test(upgrade): using the require package
Browse files Browse the repository at this point in the history
  • Loading branch information
vlastahajek committed Sep 29, 2020
1 parent 7c68ad2 commit 2a000ac
Showing 1 changed file with 14 additions and 23 deletions.
37 changes: 14 additions & 23 deletions cmd/influxd/upgrade/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import (
"path/filepath"
"testing"

"github.com/docker/docker/pkg/testutil/assert"
"github.com/influxdata/influxdb/v2/bolt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestPathValidations(t *testing.T) {
tmpdir, err := ioutil.TempDir("", "")
if err != nil {
t.Fatal(err)
}
require.Nil(t, err)

defer os.RemoveAll(tmpdir)

v1Dir := filepath.Join(tmpdir, "v1db")
Expand All @@ -24,9 +24,7 @@ func TestPathValidations(t *testing.T) {
enginePath := filepath.Join(v2Dir, "engine")

err = os.MkdirAll(filepath.Join(enginePath, "db"), 0777)
if err != nil {
t.Fatal(err)
}
require.Nil(t, err)

largs := make([]string, 0, 9)
largs = append(largs, "--username", "my-user")
Expand All @@ -43,27 +41,20 @@ func TestPathValidations(t *testing.T) {
cmd := NewCommand()
cmd.SetArgs(largs)

if err := cmd.Execute(); err == nil {
t.Fatal("Must fail")
} else {
assert.Contains(t, err.Error(), "1.x metadb error")
}
err = cmd.Execute()
require.NotNil(t, err, "Must fail")
assert.Contains(t, err.Error(), "1.x metadb error")

err = os.MkdirAll(filepath.Join(v1Dir, "meta"), 0777)
if err != nil {
t.Fatal(err)
}
require.Nil(t, err)

err = ioutil.WriteFile(filepath.Join(v1Dir, "meta", "meta.db"), []byte{1}, 0777)
if err != nil {
t.Fatal(err)
}
require.Nil(t, err)

cmd = NewCommand()
cmd.SetArgs(largs)

if err := cmd.Execute(); err == nil {
t.Fatal("Must fail")
} else {
assert.Contains(t, err.Error(), "target engine path")
}
err = cmd.Execute()
require.NotNil(t, err, "Must fail")
assert.Contains(t, err.Error(), "target engine path")
}

0 comments on commit 2a000ac

Please sign in to comment.