Adjust summary API e2e test

Signed-off-by: Itamar Holder <iholder@redhat.com>
openshift · Jul 17, 2023 · 4cb5547 · 4cb5547
1 parent e429793
commit 4cb5547
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go
@@ -112,6 +112,7 @@ var _ = SIGDescribe("Summary API [NodeConformance]", func() {
 						"PageFaults":      bounded(1000, 1e9),
 						"MajorPageFaults": bounded(0, 100000),
 					}),
+					"Swap":               swapExpectation(memoryLimit),
 					"Accelerators":       gomega.BeEmpty(),
 					"Rootfs":             gomega.BeNil(),
 					"Logs":               gomega.BeNil(),
@@ -183,6 +184,7 @@ var _ = SIGDescribe("Summary API [NodeConformance]", func() {
 							"PageFaults":      bounded(100, expectedPageFaultsUpperBound),
 							"MajorPageFaults": bounded(0, expectedMajorPageFaultsUpperBound),
 						}),
+						"Swap":         swapExpectation(memoryLimit),
 						"Accelerators": gomega.BeEmpty(),
 						"Rootfs": ptrMatchAllFields(gstruct.Fields{
 							"Time":           recent(maxStatsAge),
@@ -230,6 +232,7 @@ var _ = SIGDescribe("Summary API [NodeConformance]", func() {
 					"PageFaults":      bounded(0, expectedPageFaultsUpperBound),
 					"MajorPageFaults": bounded(0, expectedMajorPageFaultsUpperBound),
 				}),
+				"Swap": swapExpectation(memoryLimit),
 				"VolumeStats": gstruct.MatchAllElements(summaryObjectID, gstruct.Elements{
 					"test-empty-dir": gstruct.MatchAllFields(gstruct.Fields{
 						"Name":              gomega.Equal("test-empty-dir"),
@@ -280,6 +283,7 @@ var _ = SIGDescribe("Summary API [NodeConformance]", func() {
 						"PageFaults":      bounded(1000, 1e9),
 						"MajorPageFaults": bounded(0, 100000),
 					}),
+					"Swap": swapExpectation(memoryLimit),
 					// TODO(#28407): Handle non-eth0 network interface names.
 					"Network": ptrMatchAllFields(gstruct.Fields{
 						"Time": recent(maxStatsAge),
@@ -410,6 +414,27 @@ func bounded(lower, upper interface{}) types.GomegaMatcher {
 		gomega.BeNumerically("<=", upper)))
 }
 
+func swapExpectation(upper interface{}) types.GomegaMatcher {
+	// Size after which we consider memory to be "unlimited". This is not
+	// MaxInt64 due to rounding by the kernel.
+	const maxMemorySize = uint64(1 << 62)
+
+	swapBytesMatcher := gomega.Or(
+		gomega.BeNil(),
+		bounded(0, upper),
+		gstruct.PointTo(gomega.BeNumerically(">=", maxMemorySize)),
+	)
+
+	return gomega.Or(
+		gomega.BeNil(),
+		ptrMatchAllFields(gstruct.Fields{
+			"Time":               recent(maxStatsAge),
+			"SwapUsageBytes":     swapBytesMatcher,
+			"SwapAvailableBytes": swapBytesMatcher,
+		}),
+	)
+}
+
 func recent(d time.Duration) types.GomegaMatcher {
 	return gomega.WithTransform(func(t metav1.Time) time.Time {
 		return t.Time