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

test: skip test cgroup parent when use cgroup ns #2693

Merged
merged 1 commit into from
Jan 25, 2019
Merged

test: skip test cgroup parent when use cgroup ns #2693

merged 1 commit into from
Jan 25, 2019

Conversation

Ace-Tang
Copy link
Contributor

in ##2688, I make a mistake to find container cgroup path, since when
containeruse cgroup namespace, we can not get cgroup path from container
withexec cat proc/self/cgroups. Skip some test if container use cgroup
namespace.

fixes: #2685

Signed-off-by: Ace-Tang aceapril@126.com

Ⅰ. Describe what this PR did

Ⅱ. 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

in ##2688, I make a mistake to find container cgroup path, since when
containeruse cgroup namespace, we can not get cgroup path from container
with`exec cat proc/self/cgroups`. Skip some test if container use cgroup
namespace.

fixes: #2685

Signed-off-by: Ace-Tang <aceapril@126.com>
@codecov
Copy link

codecov bot commented Jan 24, 2019

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2693      +/-   ##
==========================================
+ Coverage   69.26%   69.27%   +0.01%     
==========================================
  Files         278      278              
  Lines       17392    17392              
==========================================
+ Hits        12047    12049       +2     
+ Misses       4021     4019       -2     
  Partials     1324     1324
Flag Coverage Δ
#criv1alpha2_test 39.25% <ø> (-0.12%) ⬇️
#integration_test_0 36.24% <ø> (+0.01%) ⬆️
#integration_test_1 35.13% <ø> (-0.09%) ⬇️
#integration_test_2 36.33% <ø> (ø) ⬆️
#integration_test_3 35.16% <ø> (ø) ⬆️
#node_e2e_test 35.18% <ø> (+0.04%) ⬆️
#unittest 27.36% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/container.go 56.89% <0%> (-0.77%) ⬇️
daemon/mgr/container.go 59.03% <0%> (-0.22%) ⬇️
cri/v1alpha2/cri.go 72.13% <0%> (+0.49%) ⬆️
daemon/logger/jsonfile/utils.go 73.17% <0%> (+1.62%) ⬆️
apis/server/utils.go 75% <0%> (+3.84%) ⬆️

@rudyfly
Copy link
Collaborator

rudyfly commented Jan 25, 2019

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Jan 25, 2019
@rudyfly rudyfly merged commit 6bd339f into AliyunContainerService:master Jan 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
areas/test LGTM one maintainer or community participant agrees to merge the pull reuqest. size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] memory controller missing on ubuntu
3 participants