Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822 #286

Merged
merged 2 commits into from Jul 5, 2017

Conversation

thaJeztah
Copy link
Member

Includes changes from;

@thaJeztah
Copy link
Member Author

Looks like a test needs updating, or we need to change upstream to omit the Metadata.LastTagTime if not set;

--- FAIL: TestNewInspectCommandSuccess (0.00s)
Error Trace:	helpers.go:23
		inspect_test.go:89
Error:      	Not equal: 
expected: "[{\"Id\":\"\",\"RepoTags\":null,\"RepoDigests\":null,\"Parent\":\"\",\"Comment\":\"\",\"Created\":\"\",\"Container\":\"\",\"ContainerConfig\":null,\"DockerVersion\":\"\",\"Author\":\"\",\"Config\":null,\"Architecture\":\"\",\"Os\":\"\",\"Size\":0,\"VirtualSize\":0,\"GraphDriver\":{\"Data\":null,\"Name\":\"\"},\"RootFS\":{\"Type\":\"\"}}]"
received: "[{\"Id\":\"\",\"RepoTags\":null,\"RepoDigests\":null,\"Parent\":\"\",\"Comment\":\"\",\"Created\":\"\",\"Container\":\"\",\"ContainerConfig\":null,\"DockerVersion\":\"\",\"Author\":\"\",\"Config\":null,\"Architecture\":\"\",\"Os\":\"\",\"Size\":0,\"VirtualSize\":0,\"GraphDriver\":{\"Data\":null,\"Name\":\"\"},\"RootFS\":{\"Type\":\"\"},\"Metadata\":{\"LastTagTime\":\"0001-01-01T00:00:00Z\"}}]"

@dnephin wdyt?

@thaJeztah
Copy link
Member Author

Actually, I wonder if we should change the way we test; quoting from the API reference;

The API uses an open schema model, which means server may add extra properties to responses. Likewise, the server will ignore any extra query parameters and request body properties. When you write clients, you need to ignore additional properties in responses to ensure they do not break when talking to newer Docker daemons.

@dnephin
Copy link
Contributor

dnephin commented Jul 4, 2017

I think we just need to update the test to match the new expected result

Includes changes from;

- Add a LastTagTime for images (moby/moby#31497)
- Fix handling of remote "git@" notation (moby/moby#33696)
- Move some `api` package functions away (moby/moby#33798) (related to docker#236)
- Set ping version even on error (moby/moby#33827)
- Do not add duplicate platform information to service spec (moby/moby#33867)
- Refactor MountPoint Setup function in volume.go (moby/moby#33890)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov-io
Copy link

codecov-io commented Jul 5, 2017

Codecov Report

Merging #286 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #286      +/-   ##
==========================================
- Coverage   48.93%   48.92%   -0.01%     
==========================================
  Files         177      177              
  Lines       11846    11846              
==========================================
- Hits         5797     5796       -1     
- Misses       5687     5688       +1     
  Partials      362      362

@thaJeztah
Copy link
Member Author

@dnephin @vdemeester updated the test PTAL

Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐸

Copy link
Collaborator

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83 cpuguy83 merged commit 30933b5 into docker:master Jul 5, 2017
@GordonTheTurtle GordonTheTurtle added this to the 17.07.0 milestone Jul 5, 2017
@thaJeztah thaJeztah deleted the bump-moby branch July 5, 2017 14:58
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.

None yet

6 participants