Skip to content
This repository has been archived by the owner on Feb 1, 2021. It is now read-only.

Updating info function to use engine-api #1938

Merged
merged 1 commit into from
Mar 9, 2016

Conversation

nishanttotla
Copy link
Contributor

This PR moves over the Info() function call over to use engine-api, along with corresponding tests. Some mismatch between int and int64 values needed to be adjusted.

This is part of #1879.

Signed-off-by: Nishant Totla nishanttotla@gmail.com

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
@@ -187,15 +186,14 @@ func TestLoadImage(t *testing.T) {
// create mock client
client := mockclient.NewMockClient()
apiClient := engineapimock.NewMockClient()
client.On("Info").Return(mockInfo, nil)
apiClient.On("Info").Return(mockInfo, nil)
apiClient.On("ServerVersion").Return(mockVersion, nil)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you have to move ServerVersion up in every tests ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For cosmetic reasons mostly. Last time I put it separately, away from all the client.On(...).Return(...) calls, but it makes sense to have everything together. No change in functionality.

@nishanttotla
Copy link
Contributor Author

ping @dongluochen

engine-master build failed to run, I saw this happen on some other PR also.

@dongluochen
Copy link
Contributor

LGTM

1 similar comment
@vieux
Copy link
Contributor

vieux commented Mar 9, 2016

LGTM

vieux added a commit that referenced this pull request Mar 9, 2016
Updating info function to use engine-api
@vieux vieux merged commit 8e35ac6 into docker-archive:master Mar 9, 2016
@vieux vieux deleted the info-engine-api branch March 9, 2016 23:55
ChristianKniep pushed a commit to ChristianKniep/swarm that referenced this pull request Jul 27, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants