Skip to content

Conversation

@ZYecho
Copy link
Contributor

@ZYecho ZYecho commented Dec 6, 2018

Signed-off-by: zhangyue [email protected]

Ⅰ. Describe what this PR did

In the pr #2500 , I use channel to refactor the jsonfile test case, but bring a flaky test, this pr was to fix it.

Ⅱ. Does this pull request fix one issue?

None.

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

wait for CI

Ⅳ. Describe how to verify it

wait for CI

Ⅴ. Special notes for reviews

None.

@codecov
Copy link

codecov bot commented Dec 6, 2018

Codecov Report

Merging #2540 into master will decrease coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2540      +/-   ##
==========================================
- Coverage    69.2%   69.14%   -0.06%     
==========================================
  Files         278      278              
  Lines       18528    18528              
==========================================
- Hits        12822    12811      -11     
- Misses       4242     4254      +12     
+ Partials     1464     1463       -1
Flag Coverage Δ
#criv1alpha1test 31.13% <ø> (-0.01%) ⬇️
#criv1alpha2test 35.39% <ø> (-0.03%) ⬇️
#integrationtest 40.46% <ø> (-0.17%) ⬇️
#nodee2etest 32.69% <ø> (-0.02%) ⬇️
#unittest 26.85% <ø> (ø) ⬆️
Impacted Files Coverage Δ
daemon/mgr/system.go 67.93% <0%> (-5.35%) ⬇️
daemon/mgr/snapshot.go 89.85% <0%> (-4.35%) ⬇️
ctrd/watch.go 77.46% <0%> (-4.23%) ⬇️
daemon/mgr/events.go 96.29% <0%> (-3.71%) ⬇️
ctrd/client.go 66.92% <0%> (-2.31%) ⬇️
daemon/mgr/container_utils.go 83.33% <0%> (-0.6%) ⬇️
daemon/mgr/container.go 58.47% <0%> (-0.43%) ⬇️
ctrd/container.go 58.81% <0%> (-0.4%) ⬇️
cri/v1alpha2/cri.go 70.18% <0%> (+0.75%) ⬆️
cri/v1alpha2/cri_wrapper.go 64.8% <0%> (+2.39%) ⬆️
... and 1 more

@pouchrobot pouchrobot added areas/test kind/bug This is bug report for project size/XS labels Dec 6, 2018
@ZYecho ZYecho requested a review from fuweid December 6, 2018 13:18
Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM wait for CI

@allencloud allencloud merged commit 40fea82 into AliyunContainerService:master Dec 6, 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 size/XS

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants