HDDS-911. Make TestOzoneManager unit tests independent. Contributed by Elek Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2f6bc250 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2f6bc250 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2f6bc250 Branch: refs/heads/HDFS-12943 Commit: 2f6bc250443c8d6fa6f18aab256c2ac8e585983b Parents: c5c7318 Author: Bharat Viswanadham <bha...@apache.org> Authored: Tue Dec 18 10:52:29 2018 -0800 Committer: Bharat Viswanadham <bha...@apache.org> Committed: Tue Dec 18 10:52:29 2018 -0800 ---------------------------------------------------------------------- .../hadoop/ozone/om/TestOzoneManager.java | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f6bc250/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManager.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManager.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManager.java index e6ba68e..84c5430 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManager.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManager.java @@ -63,9 +63,9 @@ import org.apache.hadoop.utils.db.Table; import org.apache.hadoop.utils.db.Table.KeyValue; import org.apache.hadoop.utils.db.TableIterator; import org.apache.ratis.util.LifeCycle; -import org.junit.AfterClass; +import org.junit.After; import org.junit.Assert; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -98,14 +98,14 @@ import static org.apache.hadoop.hdds.scm.ScmConfigKeys * Test Ozone Manager operation in distributed handler scenario. */ public class TestOzoneManager { - private static MiniOzoneCluster cluster = null; - private static StorageHandler storageHandler; - private static UserArgs userArgs; - private static OMMetrics omMetrics; - private static OzoneConfiguration conf; - private static String clusterId; - private static String scmId; - private static String omId; + private MiniOzoneCluster cluster = null; + private StorageHandler storageHandler; + private UserArgs userArgs; + private OMMetrics omMetrics; + private OzoneConfiguration conf; + private String clusterId; + private String scmId; + private String omId; @Rule public ExpectedException exception = ExpectedException.none(); @@ -117,8 +117,8 @@ public class TestOzoneManager { * * @throws IOException */ - @BeforeClass - public static void init() throws Exception { + @Before + public void init() throws Exception { conf = new OzoneConfiguration(); clusterId = UUID.randomUUID().toString(); scmId = UUID.randomUUID().toString(); @@ -140,8 +140,8 @@ public class TestOzoneManager { /** * Shutdown MiniDFSCluster. */ - @AfterClass - public static void shutdown() { + @After + public void shutdown() { if (cluster != null) { cluster.shutdown(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
