Skip to content

Conversation

@chuanchang
Copy link
Contributor

In icmd/command.go, the Expected struct contains Error and Err,
the Err will be used when expected error is included.

Signed-off-by: Alex Jia [email protected]

Ⅰ. Describe what this PR did

Fix test failure in PouchAliKernelSuite.TestAliKernelDiskQuotaWorks

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

s/Error/Err/

Ⅳ. Describe how to verify it

go test -check.f PouchAliKernelSuite.TestAliKernelDiskQuotaWorks

Ⅴ. Special notes for reviews

@allencloud
Copy link
Collaborator

I found the struct definition is:

// Expected is the expected output from a Command. This struct is compared to a
// Result struct by Result.Assert().
type Expected struct {
	ExitCode int
	Timeout  bool
	Error    string
	Out      string
	Err      string
}

So, do you know what is the difference of Error and Err ? @chuanchang

In icmd/command.go, the Expected struct contains Error and Err,
the Err will be used when expected error is included.

Signed-off-by: Alex Jia <[email protected]>
@chuanchang chuanchang force-pushed the fix_typo_in_TestAliKernelDiskQuotaWorks branch from 55826c2 to 09d89ad Compare August 3, 2018 11:33
@codecov-io
Copy link

codecov-io commented Aug 3, 2018

Codecov Report

Merging #2048 into master will increase coverage by 5.28%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2048      +/-   ##
==========================================
+ Coverage   58.69%   63.98%   +5.28%     
==========================================
  Files         202      202              
  Lines       15491    15491              
==========================================
+ Hits         9093     9912     +819     
+ Misses       5298     4340     -958     
- Partials     1100     1239     +139
Flag Coverage Δ
#criv1alpha1test 33.57% <ø> (?)
#criv1alpha2test 34.25% <ø> (ø) ⬆️
#integrationtest 38.55% <ø> (+0.03%) ⬆️
#unittest 22.16% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/watch.go 69.69% <0%> (-3.04%) ⬇️
ctrd/image.go 81.28% <0%> (+4.43%) ⬆️
cri/criservice.go 64.7% <0%> (+24.99%) ⬆️
cri/v1alpha1/cri_utils.go 82.32% <0%> (+33.03%) ⬆️
cri/v1alpha1/cri_wrapper.go 55.8% <0%> (+55.8%) ⬆️
cri/v1alpha1/cri.go 65.04% <0%> (+65.04%) ⬆️
cri/v1alpha1/server.go 79.84% <0%> (+79.84%) ⬆️
cri/v1alpha1/cri_stream.go 80% <0%> (+80%) ⬆️
cri/v1alpha1/service/cri.go 84.61% <0%> (+84.61%) ⬆️
cri/v1alpha1/cri_types.go 100% <0%> (+100%) ⬆️

@allencloud
Copy link
Collaborator

LGTM

@allencloud allencloud merged commit 0268068 into AliyunContainerService:master Aug 6, 2018
@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Aug 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

areas/test areas/typo LGTM one maintainer or community participant agrees to merge the pull reuqest. size/XS

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants