Merge pull request #963 from stevvooe/namespaces-support

namespaces: support within containerd
This commit is contained in:
Michael Crosby
2017-06-06 14:45:25 -07:00
committed by GitHub
52 changed files with 1184 additions and 223 deletions

View File

@@ -1,7 +1,6 @@
package containerd
import (
"context"
"syscall"
"testing"
)
@@ -20,9 +19,11 @@ func TestCheckpointRestore(t *testing.T) {
defer client.Close()
var (
ctx = context.Background()
id = "CheckpointRestore"
ctx, cancel = testContext()
id = "CheckpointRestore"
)
defer cancel()
image, err := client.GetImage(ctx, testImage)
if err != nil {
t.Error(err)
@@ -113,7 +114,9 @@ func TestCheckpointRestoreNewContainer(t *testing.T) {
defer client.Close()
const id = "CheckpointRestoreNewContainer"
ctx := context.Background()
ctx, cancel := testContext()
defer cancel()
image, err := client.GetImage(ctx, testImage)
if err != nil {
t.Error(err)