test fixes

Author: rjernst

server/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java

@@ -1622,10 +1622,7 @@ public void testExceptionTypeHeader() throws IOException {
         String expected = """
             {
               "type": "exception5xx",
-              "reason": "some exception",
-              "header": {
-                "X-Elasticsearch-Exception": "Exception5xx"
-              }
+              "reason": "some exception"
             }""";
         assertEquals(XContentHelper.stripWhitespace(expected), Strings.toString(builder));
     }

server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java

@@ -148,7 +148,9 @@ public void testExceptionRegistration() throws IOException, URISyntaxException {
             CancellableThreadsTests.CustomException.class,
             RestResponseTests.WithHeadersException.class,
             AbstractClientHeadersTestCase.InternalException.class,
-            ElasticsearchExceptionTests.TimeoutSubclass.class
+            ElasticsearchExceptionTests.TimeoutSubclass.class,
+            ElasticsearchExceptionTests.Exception4xx.class,
+            ElasticsearchExceptionTests.Exception5xx.class
         );
         FileVisitor<Path> visitor = new FileVisitor<Path>() {
             private Path pkgPrefix = PathUtils.get(path).getParent();

server/src/test/java/org/elasticsearch/rest/RestResponseTests.java

@@ -539,6 +539,11 @@ public static class WithHeadersException extends ElasticsearchException {
             this.addHttpHeader("My-Header", "v1");
             this.addMetadata("es.test", "value1", "value2");
         }
+
+        @Override
+        public RestStatus status() {
+            return RestStatus.BAD_REQUEST;
+        }
     }
 
     private static class SimpleExceptionRestChannel extends AbstractRestChannel {