clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-22 05:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure the base device is well created before running the tests

Browse Source
This commit is contained in:
Guillaume J. Charmes
2013-10-14 18:33:29 -07:00
parent 5892c8e469
commit 5778ed7db2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime_test.go
+6 -5
View File
@@ -148,7 +148,7 @@ func init() {
os.Setenv("TEST", "1")
os.Setenv("DOCKER_LOOPBACK_DATA_SIZE", "209715200") // 200MB
os.Setenv("DOCKER_LOOPBACK_META_SIZE", "104857600") // 100MB
os.Setenv("DOCKER_BASE_FS_SIZE", "157286400") // 150MB
os.Setenv("DOCKER_BASE_FS_SIZE", "157286400") // 150MB
// Hack to run sys init during unit testing
if selfPath := utils.SelfPath(); selfPath == "/sbin/init" || selfPath == "/.dockerinit" {
@@ -167,15 +167,16 @@ func init() {
}
// Always start from a clean set of loopback mounts
err := os.RemoveAll(unitTestStoreDevicesBase)
if err != nil {
panic(err)
if err := os.RemoveAll(unitTestStoreDevicesBase); err != nil {
log.Fatalf("Unable to remove former unit-test directory: %s", err)
}
deviceset := devmapper.NewDeviceSetDM(unitTestStoreDevicesBase)
// Create a device, which triggers the initiation of the base FS
// This avoids other tests doing this and timing out
deviceset.AddDevice("init", "")
if err := deviceset.AddDevice("init", ""); err != nil {
log.Fatalf("Unable to create the base device: %s", err)
}
// Make it our Store root
if runtime, err := NewRuntimeFromDirectory(unitTestStoreBase, deviceset, false); err != nil {