delete unnecessary checks and fix a test

erain · dmcgowan · commit aae2d0d754a7 · 2019-08-23T14:02:56.000-07:00
Signed-off-by: Yu Yi &lt;yiyu@google.com&gt;
diff --git a/client_test.go b/client_test.go
@@ -287,9 +287,6 @@ func TestImagePullSomePlatforms(t *testing.T) {
 	count := 0
 	for _, manifest := range manifests {
 		children, err := images.Children(ctx, cs, manifest)
-		if err != nil {
-			t.Fatal(err)
-		}
 
 		found := false
 		for _, matcher := range m {
@@ -315,6 +312,8 @@ func TestImagePullSomePlatforms(t *testing.T) {
 				}
 				ra.Close()
 			}
+		} else if err == nil {
+			t.Fatal("manifest should not have pulled children content")
 		}
 	}
 
diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go
@@ -123,9 +123,9 @@ func NewFetchConfig(ctx context.Context, clicontext *cli.Context) (*FetchConfig,
 		}
 		config.Platforms = p
 	}
-	if clicontext.Bool("all-manifests") {
-		config.IsAllManifests = clicontext.Bool("all-manifests")
-	}
+
+	config.IsAllManifests = clicontext.Bool("all-manifests")
+
 	return config, nil
 }
 
diff --git a/cmd/ctr/commands/images/pull.go b/cmd/ctr/commands/images/pull.go
@@ -82,9 +82,6 @@ command. As part of this process, we do the following:
 		if err != nil {
 			return err
 		}
-		if context.Bool("all-manifests") {
-			config.IsAllManifests = context.Bool("all-manifests")
-		}
 
 		img, err := content.Fetch(ctx, client, ref, config)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -287,9 +287,6 @@ func TestImagePullSomePlatforms(t *testing.T) {`
`287`	`287`	`count := 0`
`288`	`288`	`for _, manifest := range manifests {`
`289`	`289`	`children, err := images.Children(ctx, cs, manifest)`
`290`		`- if err != nil {`
`291`		`- t.Fatal(err)`
`292`		`- }`
`293`	`290`
`294`	`291`	`found := false`
`295`	`292`	`for _, matcher := range m {`
`@@ -315,6 +312,8 @@ func TestImagePullSomePlatforms(t *testing.T) {`
`315`	`312`	`}`
`316`	`313`	`ra.Close()`
`317`	`314`	`}`
	`315`	`+ } else if err == nil {`
	`316`	`+ t.Fatal("manifest should not have pulled children content")`
`318`	`317`	`}`
`319`	`318`	`}`
`320`	`319`
Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,9 @@ func NewFetchConfig(ctx context.Context, clicontext cli.Context) (FetchConfig,`
`123`	`123`	`}`
`124`	`124`	`config.Platforms = p`
`125`	`125`	`}`
`126`		`- if clicontext.Bool("all-manifests") {`
`127`		`- config.IsAllManifests = clicontext.Bool("all-manifests")`
`128`		`- }`
	`126`	`+`
	`127`	`+ config.IsAllManifests = clicontext.Bool("all-manifests")`
	`128`	`+`
`129`	`129`	`return config, nil`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,6 @@ command. As part of this process, we do the following:`
`82`	`82`	`if err != nil {`
`83`	`83`	`return err`
`84`	`84`	`}`
`85`		`- if context.Bool("all-manifests") {`
`86`		`- config.IsAllManifests = context.Bool("all-manifests")`
`87`		`- }`
`88`	`85`
`89`	`86`	`img, err := content.Fetch(ctx, client, ref, config)`
`90`	`87`	`if err != nil {`