Fix test RestStatusTests.testStatusReturnsFailureStatusWhenFailuresExist (opensearch-project#15011)

mch2 · wangdongyu.danny · commit e67b9e16de6b · 2024-08-22T16:33:12.000+08:00
This test has a reproducible failure when the highest "failure" status
is 100 level. This happens because RestStatus.status treats these as OK.

Signed-off-by: Marc Handalian &lt;marc.handalian@gmail.com&gt;
diff --git a/server/src/test/java/org/opensearch/core/RestStatusTests.java b/server/src/test/java/org/opensearch/core/RestStatusTests.java
@@ -55,7 +55,11 @@ public void testStatusReturnsFailureStatusWhenFailuresExist() {
             heapOfFailures.add(failure);
         }
 
-        assertEquals(heapOfFailures.peek().status(), RestStatus.status(successfulShards, totalShards, failures));
+        final RestStatus status = heapOfFailures.peek().status();
+        // RestStatus.status will return RestStatus.OK when the highest failure code is 100 level.
+        final RestStatus expected = status.getStatusFamilyCode() == 1 ? RestStatus.OK : status;
+
+        assertEquals(expected, RestStatus.status(successfulShards, totalShards, failures));
     }
 
     public void testSerialization() throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,11 @@ public void testStatusReturnsFailureStatusWhenFailuresExist() {`
`55`	`55`	`heapOfFailures.add(failure);`
`56`	`56`	`}`
`57`	`57`
`58`		`- assertEquals(heapOfFailures.peek().status(), RestStatus.status(successfulShards, totalShards, failures));`
	`58`	`+ final RestStatus status = heapOfFailures.peek().status();`
	`59`	`+ // RestStatus.status will return RestStatus.OK when the highest failure code is 100 level.`
	`60`	`+ final RestStatus expected = status.getStatusFamilyCode() == 1 ? RestStatus.OK : status;`
	`61`	`+`
	`62`	`+ assertEquals(expected, RestStatus.status(successfulShards, totalShards, failures));`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`public void testSerialization() throws IOException {`