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

Merge pull request #1045 from Random-Liu/fix-env-performance-issue

Browse Source 
Fix env performance issue
This commit is contained in:
Lantao Liu
2019-02-12 11:03:33 -08:00
committed by GitHub
parent 9e2ce3494d 877c1cadc1
commit b2cd840042
6 changed files with 154 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/server/container_create_test.go
View File

@@ -450,8 +450,9 @@ func TestContainerSpecCommand(t *testing.T) {
} {
config, _, imageConfig, _ := getCreateContainerTestData()
g, err := generate.New("linux")
og, err := generate.New("linux")
assert.NoError(t, err)
g := newCustomGenerator(og)
config.Command = test.criEntrypoint
config.Args = test.criArgs
imageConfig.Entrypoint = test.imageEntrypoint
@@ -664,8 +665,9 @@ func TestPrivilegedBindMount(t *testing.T) {
},
} {
t.Logf("TestCase %q", desc)
g, err := generate.New("linux")
og, err := generate.New("linux")
assert.NoError(t, err)
g := newCustomGenerator(og)
c := newTestCRIService()
c.addOCIBindMounts(&g, nil, "")
if test.privileged {
@@ -773,8 +775,9 @@ func TestMountPropagation(t *testing.T) {
},
} {
t.Logf("TestCase %q", desc)
g, err := generate.New("linux")
og, err := generate.New("linux")
assert.NoError(t, err)
g := newCustomGenerator(og)
c := newTestCRIService()
c.os.(*ostesting.FakeOS).LookupMountFn = test.fakeLookupMountFn
err = c.addOCIBindMounts(&g, []*runtime.Mount{test.criMount}, "")