libcontinaer: use new API in integration tests

Signed-off-by: Andrey Vagin <avagin@openvz.org>

integration/init_test.go

@@ -16,17 +16,7 @@ func init() {
 	}
 	runtime.LockOSThread()
 
-	container, err := loadConfig()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	rootfs, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if err := namespaces.Init(container, rootfs, "", os.NewFile(3, "pipe"), os.Args[3:]); err != nil {
+	if err := namespaces.Init(os.NewFile(3, "pipe")); err != nil {
 		log.Fatalf("unable to initialize for container: %s", err)
 	}
 	os.Exit(1)

integration/utils_test.go

@@ -8,9 +8,10 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"syscall"
 
+	"github.com/docker/libcontainer"
 	"github.com/docker/libcontainer/configs"
-	"github.com/docker/libcontainer/namespaces"
 )
 
 func newStdBuffers() *stdBuffers {
@@ -89,7 +90,49 @@ func runContainer(config *configs.Config, console string, args ...string) (buffe
 	}
 
 	buffers = newStdBuffers()
-	exitCode, err = namespaces.Exec(config, buffers.Stdin, buffers.Stdout, buffers.Stderr,
-		console, config.RootFs, args, namespaces.DefaultCreateCommand, nil)
+
+	process := &libcontainer.ProcessConfig{
+		Args:   args,
+		Env:    make([]string, 0),
+		Stdin:  buffers.Stdin,
+		Stdout: buffers.Stdout,
+		Stderr: buffers.Stderr,
+	}
+
+	factory, err := libcontainer.New(".", []string{os.Args[0], "init", "--"})
+	if err != nil {
+		return nil, -1, err
+	}
+
+	container, err := factory.Create("testCT", config)
+	if err != nil {
+		return nil, -1, err
+	}
+	defer container.Destroy()
+
+	pid, err := container.StartProcess(process)
+	if err != nil {
+		return nil, -1, err
+	}
+
+	p, err := os.FindProcess(pid)
+	if err != nil {
+		return nil, -1, err
+	}
+
+	ps, err := p.Wait()
+	if err != nil {
+		return nil, -1, err
+	}
+
+	status := ps.Sys().(syscall.WaitStatus)
+	if status.Exited() {
+		exitCode = status.ExitStatus()
+	} else if status.Signaled() {
+		exitCode = -int(status.Signal())
+	} else {
+		return nil, -1, err
+	}
+
 	return
 }