Skip to content

Conversation

@HusterWan
Copy link
Contributor

@HusterWan HusterWan commented Aug 21, 2018

Signed-off-by: Michael Wan [email protected]

Ⅰ. Describe what this PR did

Now we try TOP(Test-oriented programming), so in order making my test case happy

Just a joke 🤣

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@pouchrobot pouchrobot added kind/bug This is bug report for project size/XS labels Aug 21, 2018
@chuanchang
Copy link
Contributor

LGTM

newEnv: []string{"a=b"},
oldEnv: []string{"c=d"},
},
want: []string{"c=d", "a=b"},
Copy link
Contributor

Choose a reason for hiding this comment

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

I do not advise this way to fix, try to match every value in slice. But consider you have sort before, it also work.

Copy link
Contributor

Choose a reason for hiding this comment

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

Agree. we should sort the slice before we check.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agree, updated!

@codecov-io
Copy link

codecov-io commented Aug 21, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #2131      +/-   ##
=========================================
+ Coverage   64.88%   64.9%   +0.01%     
=========================================
  Files         208     208              
  Lines       16458   16458              
=========================================
+ Hits        10679   10682       +3     
+ Misses       4451    4449       -2     
+ Partials     1328    1327       -1
Flag Coverage Δ
#criv1alpha1test 33.26% <ø> (+0.1%) ⬆️
#criv1alpha2test 33.83% <ø> (+0.01%) ⬆️
#integrationtest 39.49% <ø> (-0.08%) ⬇️
#unittest 23.94% <ø> (ø) ⬆️
Impacted Files Coverage Δ
cri/v1alpha1/cri.go 63.79% <0%> (-0.35%) ⬇️
daemon/mgr/container.go 56.04% <0%> (ø) ⬆️
daemon/logger/jsonfile/utils.go 73.17% <0%> (+1.62%) ⬆️
ctrd/watch.go 80.3% <0%> (+4.54%) ⬆️

@HusterWan HusterWan changed the title bugfix: return sorted env slice in mergeEnvSlice test: make Test_mergeEnvSlice test case happy Aug 21, 2018
@allencloud
Copy link
Collaborator

LGTM

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

Labels

areas/test kind/bug This is bug report for project 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.

7 participants