Adjust overlay tests to expect "index=off"

estesp · estesp · commit 19776b75b3ae · 2020-11-23T18:29:57.000-05:00
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 <estesp@linux.vnet.ibm.com> (cherry picked from commit 85d9fe3)
diff --git a/snapshots/overlay/overlay_test.go b/snapshots/overlay/overlay_test.go
@@ -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,
@@ -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])
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ func testOverlayOverlayMount(t *testing.T, newSnapshotter testsuite.SnapshotterF`
`174`	`174`	`lower = "lowerdir=" + getParents(ctx, o, root, "/tmp/layer2")[0]`
`175`	`175`	`)`
`176`	`176`	`for i, v := range []string{`
	`177`	`+ "index=off",`
`177`	`178`	`work,`
`178`	`179`	`upper,`
`179`	`180`	`lower,`
`@@ -334,12 +335,12 @@ func testOverlayView(t *testing.T, newSnapshotter testsuite.SnapshotterFunc) {`
`334`	`335`	`if m.Source != "overlay" {`
`335`	`336`	`t.Errorf("mount source should be overlay but received %q", m.Source)`
`336`	`337`	`}`
`337`		`- if len(m.Options) != 1 {`
`338`		`- t.Errorf("expected 1 mount option but got %d", len(m.Options))`
	`338`	`+ if len(m.Options) != 2 {`
	`339`	`+ t.Errorf("expected 1 additional mount option but got %d", len(m.Options))`
`339`	`340`	`}`
`340`	`341`	`lowers := getParents(ctx, o, root, "/tmp/view2")`
`341`	`342`	`expected = fmt.Sprintf("lowerdir=%s:%s", lowers[0], lowers[1])`
`342`		`- if m.Options[0] != expected {`
	`343`	`+ if m.Options[1] != expected {`
`343`	`344`	`t.Errorf("expected option %q but received %q", expected, m.Options[0])`
`344`	`345`	`}`
`345`	`346`	`}`