Merge pull request moby#49188 from thaJeztah/go1.24_prep

daemon: adjust tests for changes in go1.24 JSON errors

daemon/config/config_linux_test.go

@@ -161,7 +161,7 @@ func TestDaemonConfigurationFeatures(t *testing.T) {
 		{
 			name:        "invalid config value",
 			config:      `{"features": {"containerd-snapshotter": "not-a-boolean"}}`,
-			expectedErr: `json: cannot unmarshal string into Go struct field Config.features of type bool`,
+			expectedErr: `json: cannot unmarshal string into Go struct field`,
 		},
 	}
 
@@ -179,7 +179,7 @@ func TestDaemonConfigurationFeatures(t *testing.T) {
 			}
 			cc, err := MergeDaemonConfigurations(c, flags, configFile)
 			if tc.expectedErr != "" {
-				assert.Error(t, err, tc.expectedErr)
+				assert.ErrorContains(t, err, tc.expectedErr)
 			} else {
 				assert.NilError(t, err)
 				assert.Check(t, is.DeepEqual(tc.expectedValue, cc.Features))
@@ -304,7 +304,7 @@ func TestDaemonConfigurationHostGatewayIP(t *testing.T) {
 		{
 			name:   "config not array",
 			config: `{"host-gateway-ips": "192.0.2.1"}`,
-			expErr: `json: cannot unmarshal string into Go struct field Config.host-gateway-ips of type []netip.Addr`,
+			expErr: `json: cannot unmarshal string into Go struct field`,
 		},
 		{
 			name:   "config old and new",
@@ -351,7 +351,7 @@ func TestDaemonConfigurationHostGatewayIP(t *testing.T) {
 			}
 			cc, err := MergeDaemonConfigurations(c, flags, configFile)
 			if tc.expErr != "" {
-				assert.Check(t, is.Error(err, tc.expErr))
+				assert.Check(t, is.ErrorContains(err, tc.expErr))
 				assert.Check(t, is.Nil(cc))
 			} else {
 				assert.NilError(t, err)