kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #35008 from yujuhong/cli-version

Browse source 
Fix version comparison when negotiating the the API version
This commit is contained in:
Yong Tang 2017-09-28 11:58:50 -10:00 • committed by GitHub
commit 14ce1f1cf4
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/client.go
View file

@ -248,8 +248,8 @@ func (cli *Client) NegotiateAPIVersionPing(p types.Ping) {
cli.version = api.DefaultVersion cli.version = api.DefaultVersion
} }
// if server version is lower than the maximum version supported by the Client, downgrade // if server version is lower than the client version, downgrade
if versions.LessThan(p.APIVersion, api.DefaultVersion) { if versions.LessThan(p.APIVersion, cli.version) {
cli.version = p.APIVersion cli.version = p.APIVersion
} }
} }

8
client/client_test.go
View file

@ -276,6 +276,14 @@ func TestNegotiateAPIVersion(t *testing.T) {
// test downgrade // test downgrade
client.NegotiateAPIVersionPing(ping) client.NegotiateAPIVersionPing(ping)
assert.Equal(t, expected, client.version) assert.Equal(t, expected, client.version)
// set the client version to something older, and verify that we keep the
// original setting.
expected = "1.20"
client.version = expected
client.NegotiateAPIVersionPing(ping)
assert.Equal(t, expected, client.version)
} }
// TestNegotiateAPIVersionOverride asserts that we honor // TestNegotiateAPIVersionOverride asserts that we honor