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

bugfix: add ErrorMessage in jsonstream #1927

Merged
merged 1 commit into from
Jul 31, 2018
Merged

bugfix: add ErrorMessage in jsonstream #1927

merged 1 commit into from
Jul 31, 2018

Conversation

fuweid
Copy link
Contributor

@fuweid fuweid commented Jul 30, 2018

Ⅰ. Describe what this PR did

In order to compatible with lower version of docker client, need to add
the ErrorMessage converted into error in jsonstream.

Ⅱ. Does this pull request fix one issue?

NONE

Ⅲ. Describe how you did it

NONE

Ⅳ. Describe how to verify it

Add failure in the local and test it pass. But hard to add failure right now.

Ⅴ. Special notes for reviews

In order to compatible with lower version of docker client, need to add
the ErrorMessage in jsonstream.

Signed-off-by: Wei Fu <fhfuwei@163.com>
@pouchrobot pouchrobot added kind/bug This is bug report for project size/XS labels Jul 30, 2018
@fuweid fuweid requested a review from yyb196 July 30, 2018 09:37
@codecov-io
Copy link

Codecov Report

Merging #1927 into master will decrease coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1927      +/-   ##
==========================================
- Coverage    62.8%   62.79%   -0.02%     
==========================================
  Files         200      200              
  Lines       15567    15568       +1     
==========================================
- Hits         9777     9776       -1     
- Misses       4544     4545       +1     
- Partials     1246     1247       +1
Flag Coverage Δ
#criv1alpha1test 33.24% <0%> (-0.05%) ⬇️
#criv1alpha2test 33.74% <0%> (+0.01%) ⬆️
#integrationtest 37.96% <100%> (+0.03%) ⬆️
#unittest 20.7% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
pkg/jsonstream/types.go 0% <ø> (ø) ⬆️
ctrd/image.go 81.28% <100%> (+0.09%) ⬆️
daemon/logger/jsonfile/utils.go 71.54% <0%> (-1.63%) ⬇️
cri/v1alpha1/cri.go 65.04% <0%> (-0.19%) ⬇️
cri/v1alpha2/cri.go 66.13% <0%> (+0.17%) ⬆️

@yyb196 yyb196 merged commit f7a8628 into AliyunContainerService:master Jul 31, 2018
@fuweid fuweid deleted the bugfix_align_with_v124_docker_client_when_pull branch August 3, 2018 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants