Skip to content

Commit d7ecd8f

Browse files
committed
fix
1 parent 5846983 commit d7ecd8f

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperatorUpgrade.java

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import oracle.kubernetes.operator.utils.TestUtils;
2121
import org.junit.After;
2222
import org.junit.AfterClass;
23-
import org.junit.BeforeClass;
2423
import org.junit.FixMethodOrder;
2524
import org.junit.Test;
2625
import org.junit.runners.MethodSorters;
@@ -45,24 +44,13 @@ public class ITOperatorUpgrade extends BaseTest {
4544
private Domain domain = null;
4645
private static Operator operator20;
4746

48-
/**
49-
* This method gets called only once before any of the test methods are executed. It does the
50-
* initialization of the integration test properties defined in OperatorIT.properties and setting
51-
* the resultRoot, pvRoot and projectRoot attributes.
52-
*
53-
* @throws Exception
54-
*/
55-
@BeforeClass
56-
public static void staticPrepare() throws Exception {
47+
private void setupOperatorAndDomain(String operatorGitRelease, String operatorRelease)
48+
throws Exception {
49+
logger.log(Level.INFO, "+++++++++++++++Beginning Test Setup+++++++++++++++++++++");
5750
if (!QUICKTEST) {
5851
initialize(APP_PROPS_FILE);
5952
opUpgradeTmpDir = BaseTest.getResultDir() + "/operatorupgrade";
6053
}
61-
}
62-
63-
private void setupOperatorAndDomain(String operatorGitRelease, String operatorRelease)
64-
throws Exception {
65-
logger.log(Level.INFO, "+++++++++++++++Beginning Test Setup+++++++++++++++++++++");
6654
TestUtils.exec("rm -rf " + Paths.get(opUpgradeTmpDir).toString());
6755
Files.createDirectories(Paths.get(opUpgradeTmpDir));
6856
Map<String, Object> operatorMap = TestUtils.loadYaml(OPERATOR1_YAML);

0 commit comments

Comments
 (0)