Skip to content

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

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:go1.24_prep
Jan 1, 2025
Merged

daemon: adjust tests for changes in go1.24 JSON errors#49188
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:go1.24_prep

Conversation

@thaJeztah
Copy link
Member

These tests failed because the error message changed in go1.24 through https://go.dev/cl/606956.

=== Failed
=== FAIL: daemon/config TestDaemonConfigurationFeatures/invalid_config_value (0.00s)
    config_linux_test.go:182: assertion failed: expected error "json: cannot unmarshal string into Go struct field Config.features of type bool", got "json: cannot unmarshal string into Go struct field Config.CommonConfig.features of type bool"

=== FAIL: daemon/config TestDaemonConfigurationFeatures (0.00s)

=== FAIL: daemon/config TestDaemonConfigurationHostGatewayIP/config_not_array (0.00s)
    config_linux_test.go:354: assertion failed: expected error "json: cannot unmarshal string into Go struct field Config.host-gateway-ips of type []netip.Addr", got "json: cannot unmarshal string into Go struct field Config.CommonConfig.DNSConfig.host-gateway-ips of type []netip.Addr"

Relax the tests a bit to accept errors produced by either go1.24 or older.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

These tests failed because the error message changed in go1.24 through
https://go.dev/cl/606956.

    === Failed
    === FAIL: daemon/config TestDaemonConfigurationFeatures/invalid_config_value (0.00s)
        config_linux_test.go:182: assertion failed: expected error "json: cannot unmarshal string into Go struct field Config.features of type bool", got "json: cannot unmarshal string into Go struct field Config.CommonConfig.features of type bool"

    === FAIL: daemon/config TestDaemonConfigurationFeatures (0.00s)

    === FAIL: daemon/config TestDaemonConfigurationHostGatewayIP/config_not_array (0.00s)
        config_linux_test.go:354: assertion failed: expected error "json: cannot unmarshal string into Go struct field Config.host-gateway-ips of type []netip.Addr", got "json: cannot unmarshal string into Go struct field Config.CommonConfig.DNSConfig.host-gateway-ips of type []netip.Addr"

Relax the tests a bit to accept errors produced by either go1.24 or older.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah merged commit d01dd98 into moby:master Jan 1, 2025
160 checks passed
@thaJeztah thaJeztah deleted the go1.24_prep branch January 1, 2025 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants