Satisfy the latest go lint rules
Signed-off-by: Richard Scothern <richard.scothern@docker.com>master
							parent
							
								
									c372264f17
								
							
						
					
					
						commit
						bd91493195
					
				|  | @ -111,7 +111,7 @@ func newManifestStoreTestEnv(t *testing.T, name, tag string) *manifestStoreTestE | |||
| 		stats:     make(map[string]int), | ||||
| 	} | ||||
| 
 | ||||
| 	manifestDigest, err := populateRepo(t, ctx, truthRepo, name, tag) | ||||
| 	manifestDigest, err := populateRepo(ctx, t, truthRepo, name, tag) | ||||
| 	if err != nil { | ||||
| 		t.Fatalf(err.Error()) | ||||
| 	} | ||||
|  | @ -148,7 +148,7 @@ func newManifestStoreTestEnv(t *testing.T, name, tag string) *manifestStoreTestE | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| func populateRepo(t *testing.T, ctx context.Context, repository distribution.Repository, name, tag string) (digest.Digest, error) { | ||||
| func populateRepo(ctx context.Context, t *testing.T, repository distribution.Repository, name, tag string) (digest.Digest, error) { | ||||
| 	m := schema1.Manifest{ | ||||
| 		Versioned: manifest.Versioned{ | ||||
| 			SchemaVersion: 1, | ||||
|  |  | |||
|  | @ -16,12 +16,12 @@ import ( | |||
| func CheckBlobDescriptorCache(t *testing.T, provider cache.BlobDescriptorCacheProvider) { | ||||
| 	ctx := context.Background() | ||||
| 
 | ||||
| 	checkBlobDescriptorCacheEmptyRepository(t, ctx, provider) | ||||
| 	checkBlobDescriptorCacheSetAndRead(t, ctx, provider) | ||||
| 	checkBlobDescriptorCacheClear(t, ctx, provider) | ||||
| 	checkBlobDescriptorCacheEmptyRepository(ctx, t, provider) | ||||
| 	checkBlobDescriptorCacheSetAndRead(ctx, t, provider) | ||||
| 	checkBlobDescriptorCacheClear(ctx, t, provider) | ||||
| } | ||||
| 
 | ||||
| func checkBlobDescriptorCacheEmptyRepository(t *testing.T, ctx context.Context, provider cache.BlobDescriptorCacheProvider) { | ||||
| func checkBlobDescriptorCacheEmptyRepository(ctx context.Context, t *testing.T, provider cache.BlobDescriptorCacheProvider) { | ||||
| 	if _, err := provider.Stat(ctx, "sha384:abc111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"); err != distribution.ErrBlobUnknown { | ||||
| 		t.Fatalf("expected unknown blob error with empty store: %v", err) | ||||
| 	} | ||||
|  | @ -59,7 +59,7 @@ func checkBlobDescriptorCacheEmptyRepository(t *testing.T, ctx context.Context, | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| func checkBlobDescriptorCacheSetAndRead(t *testing.T, ctx context.Context, provider cache.BlobDescriptorCacheProvider) { | ||||
| func checkBlobDescriptorCacheSetAndRead(ctx context.Context, t *testing.T, provider cache.BlobDescriptorCacheProvider) { | ||||
| 	localDigest := digest.Digest("sha384:abc111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111") | ||||
| 	expected := distribution.Descriptor{ | ||||
| 		Digest:    "sha256:abc1111111111111111111111111111111111111111111111111111111111111", | ||||
|  | @ -143,7 +143,7 @@ func checkBlobDescriptorCacheSetAndRead(t *testing.T, ctx context.Context, provi | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| func checkBlobDescriptorCacheClear(t *testing.T, ctx context.Context, provider cache.BlobDescriptorCacheProvider) { | ||||
| func checkBlobDescriptorCacheClear(ctx context.Context, t *testing.T, provider cache.BlobDescriptorCacheProvider) { | ||||
| 	localDigest := digest.Digest("sha384:def111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111") | ||||
| 	expected := distribution.Descriptor{ | ||||
| 		Digest:    "sha256:def1111111111111111111111111111111111111111111111111111111111111", | ||||
|  |  | |||
|  | @ -44,7 +44,7 @@ func setupFS(t *testing.T) *setupEnv { | |||
| 	} | ||||
| 
 | ||||
| 	for _, repo := range repos { | ||||
| 		makeRepo(t, ctx, repo, registry) | ||||
| 		makeRepo(ctx, t, repo, registry) | ||||
| 	} | ||||
| 
 | ||||
| 	expected := []string{ | ||||
|  | @ -67,7 +67,7 @@ func setupFS(t *testing.T) *setupEnv { | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| func makeRepo(t *testing.T, ctx context.Context, name string, reg distribution.Namespace) { | ||||
| func makeRepo(ctx context.Context, t *testing.T, name string, reg distribution.Namespace) { | ||||
| 	named, err := reference.ParseNamed(name) | ||||
| 	if err != nil { | ||||
| 		t.Fatal(err) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue