mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-12 18:59:50 +03:00
100 lines
3.8 KiB
Diff
100 lines
3.8 KiB
Diff
Causes tests failing to build
|
|
diff --git a/registry/handlers/api_test.go b/registry/handlers/api_test.go
|
|
index 4c7a62f..9664eea 100644
|
|
--- a/registry/handlers/api_test.go
|
|
+++ b/registry/handlers/api_test.go
|
|
@@ -885,7 +885,7 @@ func testBlobDelete(t *testing.T, env *testEnv, args blobArgs) {
|
|
ref, _ := reference.WithDigest(imageName, layerDigest)
|
|
layerURL, err := env.builder.BuildBlobURL(ref)
|
|
if err != nil {
|
|
- t.Fatalf(err.Error())
|
|
+ t.Fatal(err.Error())
|
|
}
|
|
// ---------------
|
|
// Delete a layer
|
|
diff --git a/registry/proxy/proxyblobstore_test.go b/registry/proxy/proxyblobstore_test.go
|
|
index b491d55..3307764 100644
|
|
--- a/registry/proxy/proxyblobstore_test.go
|
|
+++ b/registry/proxy/proxyblobstore_test.go
|
|
@@ -347,7 +347,7 @@ func testProxyStoreServe(t *testing.T, te *testEnv, numClients int) {
|
|
|
|
err = te.store.ServeBlob(te.ctx, w, r, remoteBlob.Digest)
|
|
if err != nil {
|
|
- t.Errorf(err.Error())
|
|
+ t.Error(err.Error())
|
|
return
|
|
}
|
|
|
|
@@ -392,7 +392,7 @@ func testProxyStoreServe(t *testing.T, te *testEnv, numClients int) {
|
|
|
|
err = te.store.ServeBlob(te.ctx, w, r, dr.Digest)
|
|
if err != nil {
|
|
- t.Fatalf(err.Error())
|
|
+ t.Fatal(err.Error())
|
|
}
|
|
|
|
dl := digest.FromBytes(w.Body.Bytes())
|
|
diff --git a/registry/proxy/proxymanifeststore_test.go b/registry/proxy/proxymanifeststore_test.go
|
|
index 4927dc1..bd7727e 100644
|
|
--- a/registry/proxy/proxymanifeststore_test.go
|
|
+++ b/registry/proxy/proxymanifeststore_test.go
|
|
@@ -115,7 +115,7 @@ func newManifestStoreTestEnv(t *testing.T, name, tag string) *manifestStoreTestE
|
|
|
|
manifestDigest, err := populateRepo(ctx, t, truthRepo, name, tag)
|
|
if err != nil {
|
|
- t.Fatalf(err.Error())
|
|
+ t.Fatal(err.Error())
|
|
}
|
|
|
|
localRegistry, err := storage.NewRegistry(ctx, inmemory.New(), storage.BlobDescriptorCacheProvider(memory.NewInMemoryBlobDescriptorCacheProvider()), storage.EnableRedirect, storage.DisableDigestResumption, storage.Schema1SigningKey(k), storage.EnableSchema1)
|
|
@@ -190,7 +190,7 @@ func populateRepo(ctx context.Context, t *testing.T, repository distribution.Rep
|
|
|
|
ms, err := repository.Manifests(ctx)
|
|
if err != nil {
|
|
- t.Fatalf(err.Error())
|
|
+ t.Fatal(err.Error())
|
|
}
|
|
dgst, err := ms.Put(ctx, sm)
|
|
if err != nil {
|
|
diff --git a/registry/proxy/scheduler/scheduler_test.go b/registry/proxy/scheduler/scheduler_test.go
|
|
index 8ac397f..85a34d5 100644
|
|
--- a/registry/proxy/scheduler/scheduler_test.go
|
|
+++ b/registry/proxy/scheduler/scheduler_test.go
|
|
@@ -171,7 +171,7 @@ func TestStopRestore(t *testing.T) {
|
|
|
|
err := s.Start()
|
|
if err != nil {
|
|
- t.Fatalf(err.Error())
|
|
+ t.Fatal(err.Error())
|
|
}
|
|
s.add(ref1, 300*timeUnit, entryTypeBlob)
|
|
s.add(ref2, 100*timeUnit, entryTypeBlob)
|
|
diff --git a/registry/storage/driver/walk_test.go b/registry/storage/driver/walk_test.go
|
|
index d6e9beb..942a9e9 100644
|
|
--- a/registry/storage/driver/walk_test.go
|
|
+++ b/registry/storage/driver/walk_test.go
|
|
@@ -39,9 +39,9 @@ func TestWalkFileRemoved(t *testing.T) {
|
|
return nil
|
|
})
|
|
if len(infos) != 1 || infos[0].Path() != "zoidberg" {
|
|
- t.Errorf(fmt.Sprintf("unexpected path set during walk: %s", infos))
|
|
+ t.Error(fmt.Sprintf("unexpected path set during walk: %s", infos))
|
|
}
|
|
if err != nil {
|
|
- t.Fatalf(err.Error())
|
|
+ t.Fatal(err.Error())
|
|
}
|
|
}
|
|
diff --git a/registry/storage/purgeuploads_test.go b/registry/storage/purgeuploads_test.go
|
|
index 398df2b..188ae2d 100644
|
|
--- a/registry/storage/purgeuploads_test.go
|
|
+++ b/registry/storage/purgeuploads_test.go
|
|
@@ -115,7 +115,7 @@ func TestPurgeOnlyUploads(t *testing.T) {
|
|
// these files aren't deleted.
|
|
dataPath, err := pathFor(uploadDataPathSpec{name: "test-repo", id: uuid.Generate().String()})
|
|
if err != nil {
|
|
- t.Fatalf(err.Error())
|
|
+ t.Fatal(err.Error())
|
|
}
|
|
nonUploadPath := strings.Replace(dataPath, "_upload", "_important", -1)
|
|
if strings.Contains(nonUploadPath, "_upload") {
|