Merge pull request #595 from kinvolk/alban/blkio-leafWeight

Zhou Hao · web-flow · commit 333d05d0d8bd · 2018-03-09T11:07:24.000+08:00
Fix condition in BlockIO test
diff --git a/validation/util/linux_resources_blkio.go b/validation/util/linux_resources_blkio.go
@@ -43,7 +43,7 @@ func ValidateLinuxResourcesBlockIO(config *rspec.Spec, state *rspec.State) error
 				t.Ok(*wd.Weight == *device.Weight, fmt.Sprintf("blkio weight for %d:%d is set correctly", device.Major, device.Minor))
 				t.Diagnosticf("expect: %d, actual: %d", *device.Weight, *wd.Weight)
 
-				t.Ok(*wd.LeafWeight != *device.LeafWeight, fmt.Sprintf("blkio leafWeight for %d:%d is set correctly", device.Major, device.Minor))
+				t.Ok(*wd.LeafWeight == *device.LeafWeight, fmt.Sprintf("blkio leafWeight for %d:%d is set correctly", device.Major, device.Minor))
 				t.Diagnosticf("expect: %d, actual: %d", *device.LeafWeight, *wd.LeafWeight)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func ValidateLinuxResourcesBlockIO(config rspec.Spec, state rspec.State) error`
`43`	`43`	`t.Ok(wd.Weight == device.Weight, fmt.Sprintf("blkio weight for %d:%d is set correctly", device.Major, device.Minor))`
`44`	`44`	`t.Diagnosticf("expect: %d, actual: %d", device.Weight, wd.Weight)`
`45`	`45`
`46`		`- t.Ok(wd.LeafWeight != device.LeafWeight, fmt.Sprintf("blkio leafWeight for %d:%d is set correctly", device.Major, device.Minor))`
	`46`	`+ t.Ok(wd.LeafWeight == device.LeafWeight, fmt.Sprintf("blkio leafWeight for %d:%d is set correctly", device.Major, device.Minor))`
`47`	`47`	`t.Diagnosticf("expect: %d, actual: %d", device.LeafWeight, wd.LeafWeight)`
`48`	`48`	`}`
`49`	`49`	`}`