Skip to content

Commit

Permalink
run testifylint -fix ./...
Browse files Browse the repository at this point in the history
  • Loading branch information
@peczenyj
peczenyj committed Jun 13, 2024
1 parent 3189a41 commit 6bd7e67
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion csbufio/reader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestReaderContextDone(t *testing.T) {
n, err := rc.Read(p)
require.ErrorIs(t, err, context.Canceled)
require.Equal(t, 0, n)
require.Len(t, p, 0)
require.Empty(t, p)

err = rc.Close()
require.ErrorIs(t, err, context.Canceled)
Expand Down
2 changes: 1 addition & 1 deletion csbufio/writer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestWriterContextDone(t *testing.T) {

b, err := io.ReadAll(pr)
require.NoError(t, err, "error reading")
require.Equal(t, 0, len(b), "")
require.Empty(t, b, "")

err = wc.Close()
require.ErrorIs(t, err, context.Canceled)
Expand Down
10 changes: 5 additions & 5 deletions store_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestStore(t *testing.T) {
}

store, err = cloudstorage.NewStore(localFsConf)
require.Nil(t, err)
require.NoError(t, err)
require.NotNil(t, store)
}

Expand All @@ -60,10 +60,10 @@ func TestJwtConf(t *testing.T) {
// t.Logf("b64 %q", v)
conf := &cloudstorage.Config{}
err := json.Unmarshal([]byte(configInput), conf)
require.Nil(t, err)
require.NoError(t, err)
conf.JwtConf.PrivateKey = "------helo-------\naGVsbG8td29ybGQ=\n-----------------end--------"
require.NotNil(t, conf.JwtConf)
require.Nil(t, conf.JwtConf.Validate())
require.NoError(t, conf.JwtConf.Validate())
require.Equal(t, "aGVsbG8td29ybGQ=", conf.JwtConf.PrivateKey)
require.Equal(t, "service_account", conf.JwtConf.Type)

Expand All @@ -84,9 +84,9 @@ func TestJwtConf(t *testing.T) {
}`
conf = &cloudstorage.Config{}
err = json.Unmarshal([]byte(configInput), conf)
require.Nil(t, err)
require.NoError(t, err)
require.NotNil(t, conf.JwtConf)
require.Nil(t, conf.JwtConf.Validate())
require.NoError(t, conf.JwtConf.Validate())
require.Equal(t, "aGVsbG8td29ybGQ=", conf.JwtConf.PrivateKey)
require.Equal(t, "service_account", conf.JwtConf.Type)
}
50 changes: 25 additions & 25 deletions testutils/testutils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func ensureContents(t *testing.T, store cloudstorage.Store, name, data, msg stri
caller := caller(2)

obj, err := store.Get(context.Background(), name)
require.Equalf(t, nil, err, msg, caller)
require.NoErrorf(t, err, msg, caller)
if err != nil {
return
}
Expand All @@ -335,13 +335,13 @@ func ensureContents(t *testing.T, store cloudstorage.Store, name, data, msg stri
f, err := obj.Open(cloudstorage.ReadOnly)
defer func() {
err = obj.Close()
require.Equalf(t, nil, err, msg, caller)
require.NoErrorf(t, err, msg, caller)
}()
require.Equalf(t, nil, err, msg, caller)
require.NoErrorf(t, err, msg, caller)
require.Equalf(t, fmt.Sprintf("%p", f), fmt.Sprintf("%p", obj.File()), msg, caller)

bytes, err := io.ReadAll(f)
require.Equalf(t, nil, err, msg, caller)
require.NoErrorf(t, err, msg, caller)
require.Equalf(t, data, string(bytes), msg, caller)
}

Expand All @@ -362,14 +362,14 @@ func Copy(t *testing.T, store cloudstorage.Store) {
obj := createFile(t, store, "from/test.csv", testcsv)

dest, err := store.NewObject("to/testcopy.csv")
require.Equalf(t, nil, err, caller)
require.NoErrorf(t, err, caller)

err = cloudstorage.Copy(context.Background(), store, obj, dest)
require.Equalf(t, nil, err, caller)
require.NoErrorf(t, err, caller)

// After copy, old should exist
obj2, err := store.Get(context.Background(), "from/test.csv")
require.Equalf(t, nil, err, caller)
require.NoErrorf(t, err, caller)
require.Equalf(t, "from/test.csv", obj2.Name(), caller)

// And also to should exist
Expand Down Expand Up @@ -492,7 +492,7 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
createObjects := func(names []string) {
for _, n := range names {
obj, err := store.NewObject(n)
require.Equalf(t, nil, err, "failed trying to call new object on:%v of %v", n, names)
require.NoErrorf(t, err, "failed trying to call new object on:%v of %v", n, names)
if obj == nil {
continue
}
Expand Down Expand Up @@ -534,20 +534,20 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
iter, _ := store.Objects(context.Background(), q)
objs, err := cloudstorage.ObjectsAll(iter)
require.NoError(t, err)
require.Equal(t, 15, len(objs), "incorrect list len. wanted 15 got %d", len(objs))
require.Len(t, objs, 15, "incorrect list len. wanted 15 got %d", len(objs))
iter.Close()

iter, _ = store.Objects(context.Background(), q)
objr, err := cloudstorage.ObjectResponseFromIter(iter)
require.NoError(t, err)
require.Equal(t, 15, len(objr.Objects), "incorrect list len. wanted 15 got %d", len(objr.Objects))
require.Len(t, objr.Objects, 15, "incorrect list len. wanted 15 got %d", len(objr.Objects))

// Now we are going to re-run this test using store.List() instead of store.Objects()
q = cloudstorage.NewQuery("list-test/")
q.Sorted()
objResp, err := store.List(context.Background(), q)
require.NoError(t, err)
require.Equal(t, 15, len(objResp.Objects), "incorrect list len. wanted 15 got %d", len(objResp.Objects))
require.Len(t, objResp.Objects, 15, "incorrect list len. wanted 15 got %d", len(objResp.Objects))

// Now we are going to re-run this test using an Object Iterator
// that uses store.List() instead of store.Objects()
Expand All @@ -567,14 +567,14 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
require.Equal(t, names[i], o.Name(), "unexpected name.")
i++
}
require.Equal(t, 15, len(objs), "incorrect list len. wanted 15 got %d", len(objs))
require.Len(t, objs, 15, "incorrect list len. wanted 15 got %d", len(objs))

q = cloudstorage.NewQuery("list-test/b")
q.Sorted()
iter, _ = store.Objects(context.Background(), q)
objs, err = cloudstorage.ObjectsAll(iter)
require.NoError(t, err)
require.Equal(t, 5, len(objs), "incorrect list len. wanted 5 got %d", len(objs))
require.Len(t, objs, 5, "incorrect list len. wanted 5 got %d", len(objs))

for i, o := range objs {
require.Equal(t, names[i+5], o.Name(), "unexpected name.")
Expand All @@ -595,12 +595,12 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
i++
}

require.Equal(t, 5, len(objs), "incorrect list len.")
require.Len(t, objs, 5, "incorrect list len.")

q = cloudstorage.NewQueryForFolders("list-test/")
folders, err = store.Folders(context.Background(), q)
require.NoError(t, err)
require.Equal(t, 3, len(folders), "incorrect list len. wanted 3 folders. %v", folders)
require.Len(t, folders, 3, "incorrect list len. wanted 3 folders. %v", folders)
sort.Strings(folders)
require.Equal(t, []string{"list-test/a/", "list-test/b/", "list-test/c/"}, folders)

Expand All @@ -621,20 +621,20 @@ func ListObjsAndFolders(t *testing.T, store cloudstorage.Store) {
q.PageSize = 500
folders, err = store.Folders(context.Background(), q)
require.NoError(t, err)
require.Equal(t, 3, len(folders), "incorrect list len. wanted 3 folders. %v", folders)
require.Len(t, folders, 3, "incorrect list len. wanted 3 folders. %v", folders)
require.Equal(t, []string{"list-test/a/", "list-test/b/", "list-test/c/"}, folders)

q = cloudstorage.NewQueryForFolders("list-test/b/")
folders, err = store.Folders(context.Background(), q)
require.NoError(t, err)
require.Equal(t, 2, len(folders), "incorrect list len. wanted 2 folders. %v", folders)
require.Len(t, folders, 2, "incorrect list len. wanted 2 folders. %v", folders)
require.Equal(t, []string{"list-test/b/b1/", "list-test/b/b2/"}, folders)

ctx, cancel := context.WithCancel(context.Background())
cancel()
folders, err = store.Folders(ctx, q)
require.Error(t, err)
require.Equal(t, 0, len(folders), "incorrect list len. wanted 0 folders. %v", folders)
require.Empty(t, folders, "incorrect list len. wanted 0 folders. %v", folders)

// List objects from a missing folder
q = cloudstorage.NewQuery("does-not-exist/")
Expand Down Expand Up @@ -769,12 +769,12 @@ func TestReadWriteCloser(t *testing.T, store cloudstorage.Store) {
data := fmt.Sprintf("pad:%v:pid:%v:time:%v:index:%v:", padding, os.Getpid(), time.Now().Nanosecond(), i)

wc, err := store.NewWriter(fileName, nil)
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
require.NoErrorf(t, err, "at loop-cnt:%v", i)
buf1 := bytes.NewBufferString(data)
_, err = buf1.WriteTo(wc)
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
require.NoErrorf(t, err, "at loop-cnt:%v", i)
err = wc.Close()
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
require.NoErrorf(t, err, "at loop-cnt:%v", i)
time.Sleep(time.Millisecond * 100)

wc, err = store.NewWriterWithContext(context.Background(), fileName, nil, cloudstorage.Opts{IfNotExists: true})
Expand All @@ -791,18 +791,18 @@ func TestReadWriteCloser(t *testing.T, store cloudstorage.Store) {
deleteIfExists(store, "prefix/test.csv")

rc, err := store.NewReader(fileName)
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
require.NoErrorf(t, err, "at loop-cnt:%v", i)
if rc == nil {
t.Fatalf("could not create reader")
return
}
buf2 := bytes.Buffer{}
_, err = buf2.ReadFrom(rc)
require.Equalf(t, nil, err, "at loop-cnt:%v", i)
require.NoErrorf(t, err, "at loop-cnt:%v", i)
require.Equalf(t, data, buf2.String(), "round trip data don't match: loop-cnt:%v", i) // extra data means we didn't truncate the file

// make sure we clean up and close
require.Nil(t, rc.Close())
require.NoError(t, rc.Close())

_, err = store.NewReader("bogus/notreal.csv")
require.Equalf(t, cloudstorage.ErrObjectNotFound, err, "at loop-cnt:%v", i)
Expand Down Expand Up @@ -887,7 +887,7 @@ func MultipleRW(t *testing.T, store cloudstorage.Store, conf *cloudstorage.Confi
require.Equal(t, fmt.Sprintf("%p", f2), fmt.Sprintf("%p", obj2.File()))
bytes, err := io.ReadAll(f2)
require.NoError(t, err)
require.Nil(t, f2.Close())
require.NoError(t, f2.Close())

require.Equal(t, data, string(bytes))

Expand Down

0 comments on commit 6bd7e67

Please sign in to comment.