HADOOP-12280. Skip unit tests based on maven profile rather than NativeCodeLoader.isNativeCodeLoaded (Masatake Iwasaki via Colin P. McCabe)
(cherry picked from commit 6f83274afc
)
This commit is contained in:
parent
e55eb6f20c
commit
e92107b18f
|
@ -232,6 +232,9 @@ Release 2.8.0 - UNRELEASED
|
|||
command-line arguments passed by the user (Masatake Iwasaki via Colin P.
|
||||
McCabe)
|
||||
|
||||
HADOOP-12280. Skip unit tests based on maven profile rather than
|
||||
NativeCodeLoader.isNativeCodeLoaded (Masatake Iwasaki via Colin P. McCabe)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
HADOOP-11785. Reduce the number of listStatus operation in distcp
|
||||
|
|
|
@ -37,6 +37,7 @@ import org.apache.hadoop.conf.Configuration;
|
|||
import org.apache.hadoop.io.DataInputBuffer;
|
||||
import org.apache.hadoop.io.DataOutputBuffer;
|
||||
import org.apache.hadoop.io.RandomDatum;
|
||||
import org.apache.hadoop.test.GenericTestUtils;
|
||||
import org.apache.hadoop.util.NativeCodeLoader;
|
||||
import org.apache.hadoop.util.ReflectionUtils;
|
||||
import org.junit.Assert;
|
||||
|
@ -69,10 +70,7 @@ public class TestCryptoCodec {
|
|||
|
||||
@Test(timeout=120000)
|
||||
public void testJceAesCtrCryptoCodec() throws Exception {
|
||||
if (!"true".equalsIgnoreCase(System.getProperty("runningWithNative"))) {
|
||||
LOG.warn("Skipping since test was not run with -Pnative flag");
|
||||
Assume.assumeTrue(false);
|
||||
}
|
||||
GenericTestUtils.assumeInNativeProfile();
|
||||
if (!NativeCodeLoader.buildSupportsOpenssl()) {
|
||||
LOG.warn("Skipping test since openSSL library not loaded");
|
||||
Assume.assumeTrue(false);
|
||||
|
@ -91,10 +89,7 @@ public class TestCryptoCodec {
|
|||
|
||||
@Test(timeout=120000)
|
||||
public void testOpensslAesCtrCryptoCodec() throws Exception {
|
||||
if (!"true".equalsIgnoreCase(System.getProperty("runningWithNative"))) {
|
||||
LOG.warn("Skipping since test was not run with -Pnative flag");
|
||||
Assume.assumeTrue(false);
|
||||
}
|
||||
GenericTestUtils.assumeInNativeProfile();
|
||||
if (!NativeCodeLoader.buildSupportsOpenssl()) {
|
||||
LOG.warn("Skipping test since openSSL library not loaded");
|
||||
Assume.assumeTrue(false);
|
||||
|
|
|
@ -30,7 +30,7 @@ public class TestCryptoStreamsWithOpensslAesCtrCryptoCodec
|
|||
|
||||
@BeforeClass
|
||||
public static void init() throws Exception {
|
||||
GenericTestUtils.assumeNativeCodeLoaded();
|
||||
GenericTestUtils.assumeInNativeProfile();
|
||||
Configuration conf = new Configuration();
|
||||
conf.set(
|
||||
CommonConfigurationKeysPublic.HADOOP_SECURITY_CRYPTO_CODEC_CLASSES_AES_CTR_NOPADDING_KEY,
|
||||
|
|
|
@ -141,7 +141,7 @@ public class TestSequenceFileAppend {
|
|||
|
||||
@Test(timeout = 30000)
|
||||
public void testAppendRecordCompression() throws Exception {
|
||||
GenericTestUtils.assumeNativeCodeLoaded();
|
||||
GenericTestUtils.assumeInNativeProfile();
|
||||
|
||||
Path file = new Path(ROOT_PATH, "testseqappendblockcompr.seq");
|
||||
fs.delete(file, true);
|
||||
|
@ -175,7 +175,7 @@ public class TestSequenceFileAppend {
|
|||
|
||||
@Test(timeout = 30000)
|
||||
public void testAppendBlockCompression() throws Exception {
|
||||
GenericTestUtils.assumeNativeCodeLoaded();
|
||||
GenericTestUtils.assumeInNativeProfile();
|
||||
|
||||
Path file = new Path(ROOT_PATH, "testseqappendblockcompr.seq");
|
||||
fs.delete(file, true);
|
||||
|
@ -250,7 +250,7 @@ public class TestSequenceFileAppend {
|
|||
|
||||
@Test(timeout = 30000)
|
||||
public void testAppendSort() throws Exception {
|
||||
GenericTestUtils.assumeNativeCodeLoaded();
|
||||
GenericTestUtils.assumeInNativeProfile();
|
||||
|
||||
Path file = new Path(ROOT_PATH, "testseqappendSort.seq");
|
||||
fs.delete(file, true);
|
||||
|
|
|
@ -414,9 +414,12 @@ public abstract class GenericTestUtils {
|
|||
}
|
||||
|
||||
/**
|
||||
* Skip test if native code is not loaded.
|
||||
* Skip test if native build profile of Maven is not activated.
|
||||
* Sub-project using this must set 'runningWithNative' property to true
|
||||
* in the definition of native profile in pom.xml.
|
||||
*/
|
||||
public static void assumeNativeCodeLoaded() {
|
||||
Assume.assumeTrue(NativeCodeLoader.isNativeCodeLoaded());
|
||||
public static void assumeInNativeProfile() {
|
||||
Assume.assumeTrue(
|
||||
Boolean.valueOf(System.getProperty("runningWithNative", "false")));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue