github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1221 from jterry75/log_g

Browse Source 
Switch to containerd/log package
This commit is contained in:
Lantao Liu
2019-08-07 13:49:33 -07:00
committed by GitHub
parent 29104d94d6 193918b702
commit 8ea0cc90aa
24 changed files with 208 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/container_create_test.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package server
import (
"context"
"os"
"path/filepath"
"reflect"
@@ -532,7 +533,7 @@ func TestContainerSpecCommand(t *testing.T) {
imageConfig.Cmd = test.imageArgs
var spec runtimespec.Spec
err := opts.WithProcessArgs(config, imageConfig)(nil, nil, nil, &spec)
err := opts.WithProcessArgs(config, imageConfig)(context.Background(), nil, nil, &spec)
if test.expectErr {
assert.Error(t, err)
continue
@@ -902,7 +903,7 @@ func TestMountPropagation(t *testing.T) {
var spec runtimespec.Spec
spec.Linux = &runtimespec.Linux{}
err := opts.WithMounts(c.os, config, []*runtime.Mount{test.criMount}, "")(nil, nil, nil, &spec)
err := opts.WithMounts(c.os, config, []*runtime.Mount{test.criMount}, "")(context.Background(), nil, nil, &spec)
if test.expectErr {
require.Error(t, err)
} else {