Merge pull request #5119 from mxpv/dm

fuweid · web-flow · commit bb3fcf62f128 · 2021-03-04T10:36:07.000+08:00
Remove flaky devmapper check
diff --git a/snapshots/devmapper/snapshotter_test.go b/snapshots/devmapper/snapshotter_test.go
@@ -136,8 +136,6 @@ func testUsage(t *testing.T, snapshotter snapshots.Snapshotter) {
 	assert.NilError(t, err)
 
 	// Should be at least 1 MB + fs metadata
-	assert.Check(t, layer2Usage.Size > sizeBytes,
+	assert.Check(t, layer2Usage.Size >= sizeBytes,
 		"%d > %d", layer2Usage.Size, sizeBytes)
-	assert.Check(t, layer2Usage.Size < sizeBytes+256*dmsetup.SectorSize,
-		"%d < %d", layer2Usage.Size, sizeBytes+256*dmsetup.SectorSize)
 }

Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,6 @@ func testUsage(t *testing.T, snapshotter snapshots.Snapshotter) {`
`136`	`136`	`assert.NilError(t, err)`
`137`	`137`
`138`	`138`	`// Should be at least 1 MB + fs metadata`
`139`		`- assert.Check(t, layer2Usage.Size > sizeBytes,`
	`139`	`+ assert.Check(t, layer2Usage.Size >= sizeBytes,`
`140`	`140`	`"%d > %d", layer2Usage.Size, sizeBytes)`
`141`		`- assert.Check(t, layer2Usage.Size < sizeBytes+256*dmsetup.SectorSize,`
`142`		`- "%d < %d", layer2Usage.Size, sizeBytes+256*dmsetup.SectorSize)`
`143`	`141`	`}`