centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-01 16:58:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix test for aufs graph and add aufs driver import

Browse Source
This commit is contained in:
Michael Crosby
2013-11-07 17:01:57 -08:00
parent b8b509e1c8
commit 12ffead71a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graph_test.go
View File

@@ -146,12 +146,12 @@ func TestMount(t *testing.T) {
if err := os.MkdirAll(rw, 0700); err != nil {
t.Fatal(err)
}
if err := graph.driver.Mount(image, tmp); err != nil {
if _, err := graph.driver.Get(image.ID); err != nil {
t.Fatal(err)
}
// FIXME: test for mount contents
defer func() {
if err := graph.driver.Unmount(tmp); err != nil {
if err := graph.driver.Cleanup(); err != nil {
t.Error(err)
}
}()
@@ -296,7 +296,7 @@ func tempGraph(t *testing.T) *Graph {
if err != nil {
t.Fatal(err)
}
backend, err := aufs.New()
backend, err := aufs.Init(path.Join(tmp, "driver"))
if err != nil {
t.Fatal(err)
}

2
runtime.go
View File

@@ -6,6 +6,7 @@ import (
"database/sql"
"fmt"
"github.com/dotcloud/docker/archive"
_ "github.com/dotcloud/docker/aufs"
_ "github.com/dotcloud/docker/devmapper"
"github.com/dotcloud/docker/gograph"
"github.com/dotcloud/docker/graphdriver"
@@ -635,6 +636,7 @@ func NewRuntimeFromDirectory(config *DaemonConfig) (*Runtime, error) {
if err != nil {
return nil, err
}
utils.Debugf("Using graph driver %s", driver)
runtimeRepo := path.Join(config.Root, "containers")