1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

don't call reexec.Init from chrootarchive

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
This commit is contained in:
unclejack 2014-11-11 13:02:14 +02:00
parent 3ac6394b80
commit 8d90b0faf8
5 changed files with 30 additions and 5 deletions

View file

@ -4,18 +4,24 @@ import (
"crypto/sha256" "crypto/sha256"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/archive"
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path"
"testing" "testing"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/reexec"
) )
var ( var (
tmp = path.Join(os.TempDir(), "aufs-tests", "aufs") tmp = path.Join(os.TempDir(), "aufs-tests", "aufs")
) )
func init() {
reexec.Init()
}
func testInit(dir string, t *testing.T) graphdriver.Driver { func testInit(dir string, t *testing.T) graphdriver.Driver {
d, err := Init(dir, nil) d, err := Init(dir, nil)
if err != nil { if err != nil {

View file

@ -1,10 +1,17 @@
package vfs package vfs
import ( import (
"github.com/docker/docker/daemon/graphdriver/graphtest"
"testing" "testing"
"github.com/docker/docker/daemon/graphdriver/graphtest"
"github.com/docker/docker/pkg/reexec"
) )
func init() {
reexec.Init()
}
// This avoids creating a new driver for each test if all tests are run // This avoids creating a new driver for each test if all tests are run
// Make sure to put new tests between TestVfsSetup and TestVfsTeardown // Make sure to put new tests between TestVfsSetup and TestVfsTeardown
func TestVfsSetup(t *testing.T) { func TestVfsSetup(t *testing.T) {

View file

@ -1,6 +1,14 @@
package graph package graph
import "testing" import (
"testing"
"github.com/docker/docker/pkg/reexec"
)
func init() {
reexec.Init()
}
func TestPools(t *testing.T) { func TestPools(t *testing.T) {
s := &TagStore{ s := &TagStore{

View file

@ -7,8 +7,13 @@ import (
"testing" "testing"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/reexec"
) )
func init() {
reexec.Init()
}
func TestChrootTarUntar(t *testing.T) { func TestChrootTarUntar(t *testing.T) {
tmpdir, err := ioutil.TempDir("", "docker-TestChrootTarUntar") tmpdir, err := ioutil.TempDir("", "docker-TestChrootTarUntar")
if err != nil { if err != nil {

View file

@ -10,7 +10,6 @@ import (
func init() { func init() {
reexec.Register("docker-untar", untar) reexec.Register("docker-untar", untar)
reexec.Register("docker-applyLayer", applyLayer) reexec.Register("docker-applyLayer", applyLayer)
reexec.Init()
} }
func fatal(err error) { func fatal(err error) {