Convert to assert.NilError

Using:

  git grep -l '^\s\+assert\.Check(t, err)$' | \
    xargs sed -i -e 's/^\(\s\+assert\)\.Check(t, err)$/\1.NilError(t, err)/'

Signed-off-by: Daniel Nephin <dnephin@docker.com>

cli/compose/convert/compose_test.go

@@ -121,7 +121,7 @@ func TestSecrets(t *testing.T) {
 	}
 
 	specs, err := Secrets(namespace, source)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Assert(t, is.Len(specs, 1))
 	secret := specs[0]
 	assert.Check(t, is.Equal("foo_one", secret.Name))
@@ -152,7 +152,7 @@ func TestConfigs(t *testing.T) {
 	}
 
 	specs, err := Configs(namespace, source)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Assert(t, is.Len(specs, 1))
 	config := specs[0]
 	assert.Check(t, is.Equal("foo_one", config.Name))

cli/compose/convert/service_test.go

@@ -20,7 +20,7 @@ import (
 
 func TestConvertRestartPolicyFromNone(t *testing.T) {
 	policy, err := convertRestartPolicy("no", nil)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual((*swarm.RestartPolicy)(nil), policy))
 }
 
@@ -34,7 +34,7 @@ func TestConvertRestartPolicyFromAlways(t *testing.T) {
 	expected := &swarm.RestartPolicy{
 		Condition: swarm.RestartPolicyConditionAny,
 	}
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, policy))
 }
 
@@ -45,7 +45,7 @@ func TestConvertRestartPolicyFromFailure(t *testing.T) {
 		Condition:   swarm.RestartPolicyConditionOnFailure,
 		MaxAttempts: &attempts,
 	}
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, policy))
 }
 
@@ -84,7 +84,7 @@ func TestConvertResourcesFull(t *testing.T) {
 		},
 	}
 	resources, err := convertResources(source)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 
 	expected := &swarm.ResourceRequirements{
 		Limits: &swarm.Resources{
@@ -109,7 +109,7 @@ func TestConvertResourcesOnlyMemory(t *testing.T) {
 		},
 	}
 	resources, err := convertResources(source)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 
 	expected := &swarm.ResourceRequirements{
 		Limits: &swarm.Resources{
@@ -140,7 +140,7 @@ func TestConvertHealthcheck(t *testing.T) {
 	}
 
 	healthcheck, err := convertHealthcheck(source)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, healthcheck))
 }
 
@@ -151,7 +151,7 @@ func TestConvertHealthcheckDisable(t *testing.T) {
 	}
 
 	healthcheck, err := convertHealthcheck(source)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, healthcheck))
 }
 
@@ -195,7 +195,7 @@ func TestConvertEndpointSpec(t *testing.T) {
 		},
 	}
 
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, *endpoint))
 }
 
@@ -212,7 +212,7 @@ func TestConvertServiceNetworksOnlyDefault(t *testing.T) {
 		},
 	}
 
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, configs))
 }
 
@@ -250,7 +250,7 @@ func TestConvertServiceNetworks(t *testing.T) {
 	sortedConfigs := byTargetSort(configs)
 	sort.Sort(&sortedConfigs)
 
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, []swarm.NetworkAttachmentConfig(sortedConfigs)))
 }
 
@@ -273,7 +273,7 @@ func TestConvertServiceNetworksCustomDefault(t *testing.T) {
 		},
 	}
 
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, []swarm.NetworkAttachmentConfig(configs)))
 }
 
@@ -294,7 +294,7 @@ func (s byTargetSort) Swap(i, j int) {
 func TestConvertDNSConfigEmpty(t *testing.T) {
 	dnsConfig, err := convertDNSConfig(nil, nil)
 
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual((*swarm.DNSConfig)(nil), dnsConfig))
 }
 
@@ -305,7 +305,7 @@ var (
 
 func TestConvertDNSConfigAll(t *testing.T) {
 	dnsConfig, err := convertDNSConfig(nameservers, search)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(&swarm.DNSConfig{
 		Nameservers: nameservers,
 		Search:      search,
@@ -314,7 +314,7 @@ func TestConvertDNSConfigAll(t *testing.T) {
 
 func TestConvertDNSConfigNameservers(t *testing.T) {
 	dnsConfig, err := convertDNSConfig(nameservers, nil)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(&swarm.DNSConfig{
 		Nameservers: nameservers,
 		Search:      nil,
@@ -323,7 +323,7 @@ func TestConvertDNSConfigNameservers(t *testing.T) {
 
 func TestConvertDNSConfigSearch(t *testing.T) {
 	dnsConfig, err := convertDNSConfig(nil, search)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(&swarm.DNSConfig{
 		Nameservers: nil,
 		Search:      search,
@@ -332,20 +332,20 @@ func TestConvertDNSConfigSearch(t *testing.T) {
 
 func TestConvertCredentialSpec(t *testing.T) {
 	swarmSpec, err := convertCredentialSpec(composetypes.CredentialSpecConfig{})
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.Nil(swarmSpec))
 
 	swarmSpec, err = convertCredentialSpec(composetypes.CredentialSpecConfig{
 		File: "/foo",
 	})
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal(swarmSpec.File, "/foo"))
 	assert.Check(t, is.Equal(swarmSpec.Registry, ""))
 
 	swarmSpec, err = convertCredentialSpec(composetypes.CredentialSpecConfig{
 		Registry: "foo",
 	})
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal(swarmSpec.File, ""))
 	assert.Check(t, is.Equal(swarmSpec.Registry, "foo"))
 

cli/compose/convert/volume_test.go

@@ -19,7 +19,7 @@ func TestConvertVolumeToMountAnonymousVolume(t *testing.T) {
 		Target: "/foo/bar",
 	}
 	mount, err := convertVolumeToMount(config, volumes{}, NewNamespace("foo"))
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, mount))
 }
 
@@ -174,7 +174,7 @@ func TestConvertVolumeToMountNamedVolume(t *testing.T) {
 		},
 	}
 	mount, err := convertVolumeToMount(config, stackVolumes, namespace)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, mount))
 }
 
@@ -221,7 +221,7 @@ func TestConvertVolumeToMountNamedVolumeWithNameCustomizd(t *testing.T) {
 		},
 	}
 	mount, err := convertVolumeToMount(config, stackVolumes, namespace)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, mount))
 }
 
@@ -245,7 +245,7 @@ func TestConvertVolumeToMountNamedVolumeExternal(t *testing.T) {
 		Target: "/foo",
 	}
 	mount, err := convertVolumeToMount(config, stackVolumes, namespace)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, mount))
 }
 
@@ -274,7 +274,7 @@ func TestConvertVolumeToMountNamedVolumeExternalNoCopy(t *testing.T) {
 		},
 	}
 	mount, err := convertVolumeToMount(config, stackVolumes, namespace)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, mount))
 }
 
@@ -296,7 +296,7 @@ func TestConvertVolumeToMountBind(t *testing.T) {
 		Bind:     &composetypes.ServiceVolumeBind{Propagation: "shared"},
 	}
 	mount, err := convertVolumeToMount(config, stackVolumes, namespace)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, mount))
 }
 
@@ -326,7 +326,7 @@ func TestConvertTmpfsToMountVolume(t *testing.T) {
 		TmpfsOptions: &mount.TmpfsOptions{SizeBytes: 1000},
 	}
 	mount, err := convertVolumeToMount(config, volumes{}, NewNamespace("foo"))
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, mount))
 }
 

cli/compose/interpolation/interpolation_test.go

@@ -47,7 +47,7 @@ func TestInterpolate(t *testing.T) {
 		},
 	}
 	result, err := Interpolate(services, Options{LookupValue: defaultMapping})
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, result))
 }
 
@@ -75,7 +75,7 @@ func TestInterpolateWithDefaults(t *testing.T) {
 		},
 	}
 	result, err := Interpolate(config, Options{})
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, result))
 }
 
@@ -92,7 +92,7 @@ func TestInterpolateWithCast(t *testing.T) {
 		LookupValue:     defaultMapping,
 		TypeCastMapping: map[Path]Cast{NewPath(PathMatchAll, "replicas"): toInt},
 	})
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	expected := map[string]interface{}{
 		"foo": map[string]interface{}{
 			"replicas": 5,

cli/compose/loader/loader_test.go

@@ -410,7 +410,7 @@ services:
       - QUX=
       - QUUX
 `, map[string]string{"QUX": "qux"})
-	assert.Check(t, err)
+	assert.NilError(t, err)
 
 	expected := types.MappingWithEquals{
 		"FOO":  strPtr("1"),

cli/compose/loader/types_test.go

@@ -319,12 +319,12 @@ configs: {}
 `
 
 	actual, err := yaml.Marshal(cfg)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal(expected, string(actual)))
 
 	// Make sure the expected still
 	dict, err := ParseYAML([]byte("version: '3.6'\n" + expected))
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	_, err = Load(buildConfigDetails(dict, map[string]string{}))
-	assert.Check(t, err)
+	assert.NilError(t, err)
 }

cli/compose/loader/volume_test.go

@@ -13,7 +13,7 @@ func TestParseVolumeAnonymousVolume(t *testing.T) {
 	for _, path := range []string{"/path", "/path/foo"} {
 		volume, err := ParseVolume(path)
 		expected := types.ServiceVolumeConfig{Type: "volume", Target: path}
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.DeepEqual(expected, volume))
 	}
 }
@@ -22,7 +22,7 @@ func TestParseVolumeAnonymousVolumeWindows(t *testing.T) {
 	for _, path := range []string{"C:\\path", "Z:\\path\\foo"} {
 		volume, err := ParseVolume(path)
 		expected := types.ServiceVolumeConfig{Type: "volume", Target: path}
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.DeepEqual(expected, volume))
 	}
 }
@@ -36,7 +36,7 @@ func TestParseVolumeShortVolumes(t *testing.T) {
 	for _, path := range []string{".", "/a"} {
 		volume, err := ParseVolume(path)
 		expected := types.ServiceVolumeConfig{Type: "volume", Target: path}
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.DeepEqual(expected, volume))
 	}
 }
@@ -56,7 +56,7 @@ func TestParseVolumeBindMount(t *testing.T) {
 			Source: path,
 			Target: "/target",
 		}
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.DeepEqual(expected, volume))
 	}
 }
@@ -74,7 +74,7 @@ func TestParseVolumeRelativeBindMountWindows(t *testing.T) {
 			Source: path,
 			Target: "d:\\target",
 		}
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.DeepEqual(expected, volume))
 	}
 }
@@ -87,7 +87,7 @@ func TestParseVolumeWithBindOptions(t *testing.T) {
 		Target: "/target",
 		Bind:   &types.ServiceVolumeBind{Propagation: "slave"},
 	}
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, volume))
 }
 
@@ -100,13 +100,13 @@ func TestParseVolumeWithBindOptionsWindows(t *testing.T) {
 		ReadOnly: true,
 		Bind:     &types.ServiceVolumeBind{Propagation: "rprivate"},
 	}
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, volume))
 }
 
 func TestParseVolumeWithInvalidVolumeOptions(t *testing.T) {
 	_, err := ParseVolume("name:/target:bogus")
-	assert.Check(t, err)
+	assert.NilError(t, err)
 }
 
 func TestParseVolumeWithVolumeOptions(t *testing.T) {
@@ -117,7 +117,7 @@ func TestParseVolumeWithVolumeOptions(t *testing.T) {
 		Target: "/target",
 		Volume: &types.ServiceVolumeVolume{NoCopy: true},
 	}
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.DeepEqual(expected, volume))
 }
 
@@ -130,7 +130,7 @@ func TestParseVolumeWithReadOnly(t *testing.T) {
 			Target:   "/target",
 			ReadOnly: true,
 		}
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.DeepEqual(expected, volume))
 	}
 }
@@ -144,7 +144,7 @@ func TestParseVolumeWithRW(t *testing.T) {
 			Target:   "/target",
 			ReadOnly: false,
 		}
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.DeepEqual(expected, volume))
 	}
 }

cli/compose/schema/schema_test.go

@@ -42,7 +42,7 @@ func TestValidateAllowsXTopLevelFields(t *testing.T) {
 	}
 
 	err := Validate(config, "3.4")
-	assert.Check(t, err)
+	assert.NilError(t, err)
 }
 
 func TestValidateSecretConfigNames(t *testing.T) {
@@ -61,7 +61,7 @@ func TestValidateSecretConfigNames(t *testing.T) {
 	}
 
 	err := Validate(config, "3.5")
-	assert.Check(t, err)
+	assert.NilError(t, err)
 }
 
 func TestValidateInvalidVersion(t *testing.T) {

cli/compose/template/template_test.go

@@ -20,7 +20,7 @@ func defaultMapping(name string) (string, bool) {
 
 func TestEscaped(t *testing.T) {
 	result, err := Substitute("$${foo}", defaultMapping)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal("${foo}", result))
 }
 
@@ -50,7 +50,7 @@ func TestInvalid(t *testing.T) {
 func TestNoValueNoDefault(t *testing.T) {
 	for _, template := range []string{"This ${missing} var", "This ${BAR} var"} {
 		result, err := Substitute(template, defaultMapping)
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.Equal("This  var", result))
 	}
 }
@@ -58,7 +58,7 @@ func TestNoValueNoDefault(t *testing.T) {
 func TestValueNoDefault(t *testing.T) {
 	for _, template := range []string{"This $FOO var", "This ${FOO} var"} {
 		result, err := Substitute(template, defaultMapping)
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.Equal("This first var", result))
 	}
 }
@@ -66,26 +66,26 @@ func TestValueNoDefault(t *testing.T) {
 func TestNoValueWithDefault(t *testing.T) {
 	for _, template := range []string{"ok ${missing:-def}", "ok ${missing-def}"} {
 		result, err := Substitute(template, defaultMapping)
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.Equal("ok def", result))
 	}
 }
 
 func TestEmptyValueWithSoftDefault(t *testing.T) {
 	result, err := Substitute("ok ${BAR:-def}", defaultMapping)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal("ok def", result))
 }
 
 func TestEmptyValueWithHardDefault(t *testing.T) {
 	result, err := Substitute("ok ${BAR-def}", defaultMapping)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal("ok ", result))
 }
 
 func TestNonAlphanumericDefault(t *testing.T) {
 	result, err := Substitute("ok ${BAR:-/non:-alphanumeric}", defaultMapping)
-	assert.Check(t, err)
+	assert.NilError(t, err)
 	assert.Check(t, is.Equal("ok /non:-alphanumeric", result))
 }
 
@@ -144,7 +144,7 @@ func TestDefaultsForMandatoryVariables(t *testing.T) {
 
 	for _, tc := range testCases {
 		result, err := Substitute(tc.template, defaultMapping)
-		assert.Check(t, err)
+		assert.NilError(t, err)
 		assert.Check(t, is.Equal(tc.expected, result))
 	}
 }