p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse a single DeviceSetDM for all the tests

Browse Source 
We wrap the "real" DeviceSet for each test so that we get only
a single device-mapper pool and loopback mounts, but still
separate out the IDs in the tests. This makes the test run
much faster.
Upstream-commit: 52294192b2a008b624862701cbf8491ad19b0798
Component: engine
This commit is contained in:
Alexander Larsson
2013-09-06 14:38:47 +02:00
committed by Tianon Gravi
parent 0a6a934279
commit 816bf23aaf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/runtime_test.go
View File

@ -457,7 +457,7 @@ func TestRestore(t *testing.T) {
// Here are are simulating a docker restart - that is, reloading all containers
// from scratch
runtime2, err := NewRuntimeFromDirectory(runtime1.root, devmapper.NewDeviceSetDM(runtime1.root), false)
runtime2, err := NewRuntimeFromDirectory(runtime1.root, runtime1.deviceSet, false)
if err != nil {
t.Fatal(err)
}

4
components/engine/utils_test.go
View File

@ -2,7 +2,7 @@ package docker
import (
"github.com/dotcloud/docker/utils"
"github.com/dotcloud/docker/devmapper"
"path/filepath"
"io"
"io/ioutil"
"os"
@ -43,7 +43,7 @@ func newTestRuntime() (*Runtime, error) {
return nil, err
}
runtime, err := NewRuntimeFromDirectory(root, devmapper.NewDeviceSetDM(root), false)
runtime, err := NewRuntimeFromDirectory(root, NewDeviceSetWrapper (globalRuntime.deviceSet, filepath.Base(root)), false)
if err != nil {
return nil, err
}