rtyler
/
containerd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update integration tests for new spec changes 

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-04-27 14:27:21 -07:00
parent b9c50a50e9
commit d0b84ced9b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containerd-shim/process_linux.go
View File

@ -84,7 +84,7 @@ func (p *process) openIO() error {
}
p.shimIO = i
// non-tty
ioClosers := make([]io.Closer, 0)
var ioClosers []io.Closer
for _, pair := range []struct {
name string
dest func(wc io.WriteCloser, rc io.Closer)

2
integration-test/start_linux_test.go
View File

@ -325,7 +325,7 @@ func (cs *ContainerdSuite) TestOOM(t *check.C) {
if err := CreateBundleWithFilter("busybox", bundleName, []string{"sh", "-c", "x=oom-party-time; while true; do x=$x$x$x$x$x$x$x$x$x$x; done"}, func(spec *ocs.Spec) {
// Limit to 512k for quick oom
var limit uint64 = 8 * 1024 * 1024
spec.Linux.Resources.Memory = &ocs.Memory{
spec.Linux.Resources.Memory = &ocs.LinuxMemory{
Limit: &limit,
}
if swapEnabled() {