Merge pull request #1221 from jterry75/log_g

Switch to containerd/log package
2019-08-07 13:49:33 -07:00
parent 29104d94d6 193918b702
commit 8ea0cc90aa
24 changed files with 208 additions and 230 deletions
--- a/pkg/server/helpers_test.go
+++ b/pkg/server/helpers_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package server

 import (
+	"context"
 	"testing"

 	"github.com/BurntSushi/toml"
@@ -385,7 +386,7 @@ func TestEnvDeduplication(t *testing.T) {
 			}
 		}
 		for _, kv := range test.kv {
-			oci.WithEnv([]string{kv[0] + "=" + kv[1]})(nil, nil, nil, &spec)
+			oci.WithEnv([]string{kv[0] + "=" + kv[1]})(context.Background(), nil, nil, &spec)
 		}
 		assert.Equal(t, test.expected, spec.Process.Env)
 	}