mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-05-18 19:54:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(general): Cleaner error checking in retention tests (#3164)

Browse Source 
* More robust error comparisons in retention tests

Update tests for retention to use `ErrorIs` checks instead of comparing
error messages.

* Use `require.NoError` in retention tests

Minor cleanup to reduce branches in code by using `require.NoError`
instead of if-blocks and `t.Fatal`.
This commit is contained in:
ashmrtn
2023-07-20 17:29:17 -07:00
committed by GitHub
parent d97679608e
commit 2b73527b43
3 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/blobtesting/object_locking_map.go
View File

@@ -14,6 +14,8 @@
"github.com/kopia/kopia/repo/blob"
)
var ErrBlobLocked = errors.New("cannot alter object before retention period expires")
type entry struct {
value []byte
mtime time.Time
@@ -60,7 +62,7 @@ func (s *objectLockingMap) getLatestForMutationLocked(id blob.ID) (*entry, error
}
if !e.retentionTime.IsZero() && e.retentionTime.After(s.timeNow()) {
return nil, errors.New("cannot alter object before retention period expires")
return nil, errors.WithStack(ErrBlobLocked)
}
return e, nil

22
repo/blob/storage_extend_test.go
View File

@@ -6,7 +6,9 @@
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/kopia/kopia/internal/blobtesting"
"github.com/kopia/kopia/internal/cache"
"github.com/kopia/kopia/internal/faketime"
"github.com/kopia/kopia/internal/repotesting"
@@ -46,9 +48,7 @@ func (s *formatSpecificTestSuite) TestExtendBlobRetention(t *testing.T) {
env.RepositoryWriter.Flush(ctx)
blobsBefore, err := blob.ListAllBlobs(ctx, env.RepositoryWriter.BlobStorage(), "")
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)
if got, want := len(blobsBefore), 4; got != want {
t.Fatalf("unexpected number of blobs after writing: %v", blobsBefore)
@@ -59,37 +59,31 @@ func (s *formatSpecificTestSuite) TestExtendBlobRetention(t *testing.T) {
// Verify that file is locked
_, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour)
assert.EqualErrorf(t, err, "cannot alter object before retention period expires", "Altering locked object should fail")
assert.ErrorIs(t, err, blobtesting.ErrBlobLocked, "Altering locked object should fail")
ta.Advance(7 * 24 * time.Hour)
// Verify that file is unlocked
_, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour)
if err != nil {
t.Fatalf("Altering expired object failed")
}
require.NoError(t, err, "Altering expired object failed")
// Relock blob
err = env.RepositoryWriter.BlobStorage().ExtendBlobRetention(ctx, blobsBefore[lastBlobIdx].BlobID, blob.ExtendOptions{
RetentionMode: blob.Governance,
RetentionPeriod: 2 * time.Hour,
})
if err != nil {
t.Fatalf("Extending Retention time failed, got err: %v", err)
}
require.NoErrorf(t, err, "Extending Retention time failed, got err: %v", err)
// Verify Lock period
ta.Advance(1 * time.Hour)
_, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour)
assert.EqualErrorf(t, err, "cannot alter object before retention period expires", "Altering locked object should fail")
assert.ErrorIs(t, err, blobtesting.ErrBlobLocked, "Altering locked object should fail")
ta.Advance(2 * time.Hour)
_, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour)
if err != nil {
t.Fatalf("Altering expired object failed")
}
require.NoError(t, err, "Altering expired object failed")
}
func (s *formatSpecificTestSuite) TestExtendBlobRetentionUnsupported(t *testing.T) {

37
repo/maintenance/blob_retain_test.go
View File

@@ -6,7 +6,9 @@
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/kopia/kopia/internal/blobtesting"
"github.com/kopia/kopia/internal/cache"
"github.com/kopia/kopia/internal/faketime"
"github.com/kopia/kopia/internal/repotesting"
@@ -45,9 +47,7 @@ func (s *formatSpecificTestSuite) TestExtendBlobRetentionTime(t *testing.T) {
env.RepositoryWriter.Flush(ctx)
blobsBefore, err := blob.ListAllBlobs(ctx, env.RepositoryWriter.BlobStorage(), "")
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)
if got, want := len(blobsBefore), 4; got != want {
t.Fatalf("unexpected number of blobs after writing: %v", blobsBefore)
@@ -58,17 +58,15 @@ func (s *formatSpecificTestSuite) TestExtendBlobRetentionTime(t *testing.T) {
ta.Advance(7 * 24 * time.Hour)
if _, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour); err != nil {
t.Fatalf("Altering expired object failed")
}
_, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour)
require.NoError(t, err, "Altering expired object failed")
// extend retention time of all blobs
if _, err = maintenance.ExtendBlobRetentionTime(ctx, env.RepositoryWriter, maintenance.ExtendBlobRetentionTimeOptions{}); err != nil {
t.Fatal(err)
}
_, err = maintenance.ExtendBlobRetentionTime(ctx, env.RepositoryWriter, maintenance.ExtendBlobRetentionTimeOptions{})
require.NoError(t, err)
_, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour)
assert.EqualErrorf(t, err, "cannot alter object before retention period expires", "Altering locked object should fail")
assert.ErrorIs(t, err, blobtesting.ErrBlobLocked, "Altering locked object should fail")
}
func (s *formatSpecificTestSuite) TestExtendBlobRetentionTimeDisabled(t *testing.T) {
@@ -95,9 +93,7 @@ func (s *formatSpecificTestSuite) TestExtendBlobRetentionTimeDisabled(t *testing
env.RepositoryWriter.Flush(ctx)
blobsBefore, err := blob.ListAllBlobs(ctx, env.RepositoryWriter.BlobStorage(), "")
if err != nil {
t.Fatal(err)
}
require.NoError(t, err)
if got, want := len(blobsBefore), 4; got != want {
t.Fatalf("unexpected number of blobs after writing: %v", blobsBefore)
@@ -108,16 +104,13 @@ func (s *formatSpecificTestSuite) TestExtendBlobRetentionTimeDisabled(t *testing
ta.Advance(7 * 24 * time.Hour)
if _, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour); err != nil {
t.Fatalf("Altering expired object failed")
}
_, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour)
require.NoError(t, err, "Altering expired object failed")
// extend retention time of all blobs
if _, err = maintenance.ExtendBlobRetentionTime(ctx, env.RepositoryWriter, maintenance.ExtendBlobRetentionTimeOptions{}); err != nil {
t.Fatal(err)
}
_, err = maintenance.ExtendBlobRetentionTime(ctx, env.RepositoryWriter, maintenance.ExtendBlobRetentionTimeOptions{})
require.NoError(t, err)
if _, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour); err != nil {
t.Fatalf("Altering expired object failed")
}
_, err = st.TouchBlob(ctx, blobsBefore[lastBlobIdx].BlobID, time.Hour)
require.NoError(t, err, "Altering expired object failed")
}