Skip to content

Commit 3a2aa62

Browse files
prashantpogderakeshadr
authored andcommitted
HDDS-3446. Enable TestOzoneManagerRestart and address any failure. (apache#1279)
1 parent 029fa0d commit 3a2aa62

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@
4141
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS;
4242
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS_WILDCARD;
4343
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS;
44-
import org.junit.After;
44+
import org.junit.AfterClass;
4545
import org.junit.Assert;
4646
import static org.junit.Assert.fail;
47-
import org.junit.Before;
48-
import org.junit.Ignore;
47+
import org.junit.BeforeClass;
4948
import org.junit.Rule;
5049
import org.junit.Test;
5150
import org.junit.rules.Timeout;
@@ -54,16 +53,15 @@
5453
* Test some client operations after cluster starts. And perform restart and
5554
* then performs client operations and check the behavior is expected or not.
5655
*/
57-
@Ignore
5856
public class TestOzoneManagerRestart {
59-
private MiniOzoneCluster cluster = null;
60-
private OzoneConfiguration conf;
61-
private String clusterId;
62-
private String scmId;
63-
private String omId;
57+
private static MiniOzoneCluster cluster = null;
58+
private static OzoneConfiguration conf;
59+
private static String clusterId;
60+
private static String scmId;
61+
private static String omId;
6462

6563
@Rule
66-
public Timeout timeout = new Timeout(60000);
64+
public Timeout timeout = new Timeout(240000);
6765

6866
/**
6967
* Create a MiniDFSCluster for testing.
@@ -72,8 +70,8 @@ public class TestOzoneManagerRestart {
7270
*
7371
* @throws IOException
7472
*/
75-
@Before
76-
public void init() throws Exception {
73+
@BeforeClass
74+
public static void init() throws Exception {
7775
conf = new OzoneConfiguration();
7876
clusterId = UUID.randomUUID().toString();
7977
scmId = UUID.randomUUID().toString();
@@ -94,8 +92,8 @@ public void init() throws Exception {
9492
/**
9593
* Shutdown MiniDFSCluster.
9694
*/
97-
@After
98-
public void shutdown() {
95+
@AfterClass
96+
public static void shutdown() {
9997
if (cluster != null) {
10098
cluster.shutdown();
10199
}

0 commit comments

Comments
 (0)