Skip to content

Commit

Permalink
Adjust overlay tests to expect "index=off"
Browse files Browse the repository at this point in the history
When running tests on any modern distro, this assumption will work. If
we need to make it work with kernels where we don't append this option
it will require some more involved changes.

Signed-off-by: Phil Estes <[email protected]>
(cherry picked from commit 85d9fe3)
Signed-off-by: Akihiro Suda <[email protected]>
  • Loading branch information
estesp authored and AkihiroSuda committed Mar 11, 2021
1 parent 0edc412 commit 5173ed3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions snapshots/overlay/overlay_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ func testOverlayOverlayMount(t *testing.T, newSnapshotter testsuite.SnapshotterF
lower = "lowerdir=" + getParents(ctx, o, root, "/tmp/layer2")[0]
)
for i, v := range []string{
"index=off",
work,
upper,
lower,
Expand Down Expand Up @@ -334,12 +335,12 @@ func testOverlayView(t *testing.T, newSnapshotter testsuite.SnapshotterFunc) {
if m.Source != "overlay" {
t.Errorf("mount source should be overlay but received %q", m.Source)
}
if len(m.Options) != 1 {
t.Errorf("expected 1 mount option but got %d", len(m.Options))
if len(m.Options) != 2 {
t.Errorf("expected 1 additional mount option but got %d", len(m.Options))
}
lowers := getParents(ctx, o, root, "/tmp/view2")
expected = fmt.Sprintf("lowerdir=%s:%s", lowers[0], lowers[1])
if m.Options[0] != expected {
if m.Options[1] != expected {
t.Errorf("expected option %q but received %q", expected, m.Options[0])
}
}

0 comments on commit 5173ed3

Please sign in to comment.