vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

snapshot/overlay: port overlay driver to Snapshotter

Browse source 
With the change to the snapshotter interface, we've now updated the
overlay driver to follow the conventions of the current test suite. To
support key unification, an hashed index was added to active and
committed directories. We still need to do some testing around
collisions, but we'll leave that for a future PR.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2017-02-07 15:51:37 -08:00
parent ab08944aa7
commit e6c1bb0ff2
No known key found for this signature in database
GPG key ID: 67B3DED84EDC823F
2 changed files with 179 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

34
snapshot/overlay/overlay_test.go
View file

@ -13,12 +13,24 @@ import (
)
func TestOverlay(t *testing.T) {
testutil.RequiresRoot(t)
snapshot.SnapshotterSuite(t, "Overlay", func(root string) (snapshot.Snapshotter, func(), error) {
snapshotter, err := NewSnapshotter(root)
if err != nil {
t.Fatal(err)
}
return snapshotter, func() {}, nil
})
}
func TestOverlayMounts(t *testing.T) {
root, err := ioutil.TempDir("", "overlay")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(root)
o, err := NewDriver(root)
o, err := NewSnapshotter(root)
if err != nil {
t.Error(err)
return
@ -53,7 +65,7 @@ func TestOverlayCommit(t *testing.T) {
t.Fatal(err)
}
defer os.RemoveAll(root)
o, err := NewDriver(root)
o, err := NewSnapshotter(root)
if err != nil {
t.Error(err)
return
@ -81,7 +93,7 @@ func TestOverlayOverlayMount(t *testing.T) {
t.Fatal(err)
}
defer os.RemoveAll(root)
o, err := NewDriver(root)
o, err := NewSnapshotter(root)
if err != nil {
t.Error(err)
return
@ -115,7 +127,7 @@ func TestOverlayOverlayMount(t *testing.T) {
sh = hash("base")
work = "workdir=" + filepath.Join(root, "active", ah, "work")
upper = "upperdir=" + filepath.Join(root, "active", ah, "fs")
lower = "lowerdir=" + filepath.Join(root, "snapshots", sh, "fs")
lower = "lowerdir=" + filepath.Join(root, "committed", sh, "fs")
)
for i, v := range []string{
work,
@ -135,7 +147,7 @@ func TestOverlayOverlayRead(t *testing.T) {
t.Fatal(err)
}
defer os.RemoveAll(root)
o, err := NewDriver(root)
o, err := NewSnapshotter(root)
if err != nil {
t.Error(err)
return
@ -179,15 +191,3 @@ func TestOverlayOverlayRead(t *testing.T) {
return
}
}
func TestOverlayDriverSuite(t *testing.T) {
testutil.RequiresRoot(t)
snapshot.DriverSuite(t, "Overlay", func(root string) (snapshot.Driver, func(), error) {
driver, err := NewDriver(root)
if err != nil {
t.Fatal(err)
}
return driver, func() {}, nil
})
}