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

Revert "test: increate the memory limit to TestRunWithMemoryswap2x" #2737

Merged
merged 1 commit into from
Mar 8, 2019

Conversation

Ace-Tang
Copy link
Contributor

@Ace-Tang Ace-Tang commented Mar 8, 2019

This reverts commit 69e6356.

Ⅰ. Describe what this PR did

Thank for the wonderful work in opencontainers/runc#1984 slove this problem with bind way, by the way, it also sloved the kernel limit problem in opencontainers/runc#1979

After alibaba-archive/runc#20 merged, we can revert the change in TestRunWithMemoryswap2x.

/cc @fuweid

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

@codecov
Copy link

codecov bot commented Mar 8, 2019

Codecov Report

Merging #2737 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2737      +/-   ##
==========================================
+ Coverage   69.31%   69.32%   +<.01%     
==========================================
  Files         278      278              
  Lines       17442    17442              
==========================================
+ Hits        12090    12091       +1     
+ Misses       4025     4024       -1     
  Partials     1327     1327
Flag Coverage Δ
#criv1alpha2_test 39.48% <ø> (+0.08%) ⬆️
#integration_test_0 36.59% <ø> (-0.05%) ⬇️
#integration_test_1 35.46% <ø> (-0.04%) ⬇️
#integration_test_2 36.55% <ø> (+0.01%) ⬆️
#integration_test_3 35.42% <ø> (ø) ⬆️
#node_e2e_test 35.32% <ø> (+0.03%) ⬆️
#unittest 28.44% <ø> (ø) ⬆️
Impacted Files Coverage Δ
ctrd/container.go 56.51% <0%> (-1.15%) ⬇️
daemon/mgr/container.go 60.58% <0%> (-0.21%) ⬇️
cri/v1alpha2/cri.go 71.59% <0%> (+0.12%) ⬆️
pkg/streams/utils.go 91.66% <0%> (+2.38%) ⬆️
cri/ocicni/cni_manager.go 70.58% <0%> (+11.76%) ⬆️

This reverts commit 69e6356.

Signed-off-by: Ace-Tang <aceapril@126.com>
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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants