HDDS-1264. Remove Parametrized in TestOzoneShell. (#614)
This commit is contained in:
parent
eef8cae7cf
commit
b2269581f7
@ -29,7 +29,6 @@
|
|||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@ -54,7 +53,6 @@
|
|||||||
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
|
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
|
||||||
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
|
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
|
||||||
import org.apache.hadoop.ozone.client.rest.OzoneException;
|
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.client.rpc.RpcClient;
|
||||||
import org.apache.hadoop.ozone.om.exceptions.OMException;
|
import org.apache.hadoop.ozone.om.exceptions.OMException;
|
||||||
import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes;
|
import org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes;
|
||||||
@ -90,8 +88,6 @@
|
|||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.rules.Timeout;
|
import org.junit.rules.Timeout;
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.junit.runners.Parameterized;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import picocli.CommandLine;
|
import picocli.CommandLine;
|
||||||
@ -104,7 +100,6 @@
|
|||||||
/**
|
/**
|
||||||
* This test class specified for testing Ozone shell command.
|
* This test class specified for testing Ozone shell command.
|
||||||
*/
|
*/
|
||||||
@RunWith(value = Parameterized.class)
|
|
||||||
public class TestOzoneShell {
|
public class TestOzoneShell {
|
||||||
|
|
||||||
private static final Logger LOG =
|
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_OUT = System.out;
|
||||||
private static final PrintStream OLD_ERR = System.err;
|
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
|
* Create a MiniDFSCluster for testing with using distributed Ozone
|
||||||
* handler type.
|
* handler type.
|
||||||
@ -182,17 +167,8 @@ public static void shutdown() {
|
|||||||
public void setup() {
|
public void setup() {
|
||||||
System.setOut(new PrintStream(out));
|
System.setOut(new PrintStream(out));
|
||||||
System.setErr(new PrintStream(err));
|
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
|
@After
|
||||||
public void reset() {
|
public void reset() {
|
||||||
@ -552,7 +528,7 @@ private void executeWithError(Shell ozoneShell, String[] args,
|
|||||||
@Test
|
@Test
|
||||||
public void testListVolume() throws Exception {
|
public void testListVolume() throws Exception {
|
||||||
LOG.info("Running testListVolume");
|
LOG.info("Running testListVolume");
|
||||||
String protocol = clientProtocol.getName().toLowerCase();
|
String protocol = "rpcclient";
|
||||||
String commandOutput, commandError;
|
String commandOutput, commandError;
|
||||||
List<VolumeInfo> volumes;
|
List<VolumeInfo> volumes;
|
||||||
final int volCount = 20;
|
final int volCount = 20;
|
||||||
|
Loading…
Reference in New Issue
Block a user