You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/03/27 05:07:27 UTC
[hadoop] branch trunk updated: HDDS-1264. Remove Parametrized in
TestOzoneShell. (#614)
This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new b226958 HDDS-1264. Remove Parametrized in TestOzoneShell. (#614)
b226958 is described below
commit b2269581f74df4045cb169a4ce328957c26062ae
Author: Vivek Ratnavel Subramanian <vi...@gmail.com>
AuthorDate: Tue Mar 26 22:07:22 2019 -0700
HDDS-1264. Remove Parametrized in TestOzoneShell. (#614)
---
.../hadoop/ozone/ozShell/TestOzoneShell.java | 28 ++--------------------
1 file changed, 2 insertions(+), 26 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java
index 7f77f87..baea4ec 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShell.java
@@ -29,7 +29,6 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -54,7 +53,6 @@ import org.apache.hadoop.ozone.client.VolumeArgs;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
import org.apache.hadoop.ozone.client.rest.OzoneException;
-import org.apache.hadoop.ozone.client.rest.RestClient;
import org.apache.hadoop.ozone.client.rpc.RpcClient;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes;
@@ -90,8 +88,6 @@ import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.Timeout;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import picocli.CommandLine;
@@ -104,7 +100,6 @@ import picocli.CommandLine.RunLast;
/**
* This test class specified for testing Ozone shell command.
*/
-@RunWith(value = Parameterized.class)
public class TestOzoneShell {
private static final Logger LOG =
@@ -128,16 +123,6 @@ public class TestOzoneShell {
private static final PrintStream OLD_OUT = System.out;
private static final PrintStream OLD_ERR = System.err;
- @Parameterized.Parameters
- public static Collection<Object[]> clientProtocol() {
- Object[][] params = new Object[][] {
- {RpcClient.class}};
- return Arrays.asList(params);
- }
-
- @Parameterized.Parameter
- @SuppressWarnings("visibilitymodifier")
- public Class clientProtocol;
/**
* Create a MiniDFSCluster for testing with using distributed Ozone
* handler type.
@@ -182,16 +167,7 @@ public class TestOzoneShell {
public void setup() {
System.setOut(new PrintStream(out));
System.setErr(new PrintStream(err));
-
- if(clientProtocol.equals(RestClient.class)) {
- String hostName = cluster.getOzoneManager().getHttpServer()
- .getHttpAddress().getHostName();
- int port = cluster
- .getOzoneManager().getHttpServer().getHttpAddress().getPort();
- url = String.format("http://%s:%d", hostName, port);
- } else {
- url = "o3://" + getOmAddress();
- }
+ url = "o3://" + getOmAddress();
}
@After
@@ -552,7 +528,7 @@ public class TestOzoneShell {
@Test
public void testListVolume() throws Exception {
LOG.info("Running testListVolume");
- String protocol = clientProtocol.getName().toLowerCase();
+ String protocol = "rpcclient";
String commandOutput, commandError;
List<VolumeInfo> volumes;
final int volCount = 20;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org