diff --git a/buildSrc/src/main/resources/checkstyle_suppressions.xml b/buildSrc/src/main/resources/checkstyle_suppressions.xml index 7d3322cc603..9f36857c8b2 100644 --- a/buildSrc/src/main/resources/checkstyle_suppressions.xml +++ b/buildSrc/src/main/resources/checkstyle_suppressions.xml @@ -1450,7 +1450,6 @@ - diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/rule/RepeatOnExceptionRule.java b/test/framework/src/main/java/org/elasticsearch/test/junit/rule/RepeatOnExceptionRule.java deleted file mode 100644 index 7ded36f3809..00000000000 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/rule/RepeatOnExceptionRule.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.elasticsearch.test.junit.rule; - -import org.elasticsearch.common.logging.ESLogger; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -/** - * A helper rule to catch all BindTransportExceptions - * and rerun the test for a configured number of times - * - * Note: Be aware, that when a test is repeated, the @After and @Before - * annotated methods are not run a second time - * - */ -public class RepeatOnExceptionRule implements TestRule { - - private ESLogger logger; - private int retryCount; - private Class expectedException; - - /** - * - * @param logger the es logger from the test class - * @param retryCount number of amounts to try a single test before failing - * @param expectedException The exception class you want to catch - * - */ - public RepeatOnExceptionRule(ESLogger logger, int retryCount, Class expectedException) { - this.logger = logger; - this.retryCount = retryCount; - this.expectedException = expectedException; - } - - @Override - public Statement apply(final Statement base, Description description) { - - return new Statement() { - @Override - public void evaluate() throws Throwable { - Throwable caughtThrowable = null; - - for (int i = 0; i < retryCount; i++) { - try { - base.evaluate(); - return; - } catch (Throwable t) { - if (t.getClass().equals(expectedException)) { - caughtThrowable = t; - logger.info("Exception [{}] occurred, rerunning the test after [{}] failures", t, t.getClass().getSimpleName(), i+1); - } else { - throw t; - } - } - } - logger.error("Giving up after [{}] failures... marking test as failed", retryCount); - throw caughtThrowable; - } - }; - - } -}