Repository: sqoop Updated Branches: refs/heads/trunk 7ab99f41c -> 7f61ae21e
SQOOP-3399: TestS3ImportWithHadoopCredProvider fails if credential generator command is not provided (Szabolcs Vasas) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/7f61ae21 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/7f61ae21 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/7f61ae21 Branch: refs/heads/trunk Commit: 7f61ae21e39a45b2b5e0107c4165bc4a255a27eb Parents: 7ab99f4 Author: Szabolcs Vasas <va...@apache.org> Authored: Thu Oct 25 08:40:00 2018 +0200 Committer: Szabolcs Vasas <va...@apache.org> Committed: Thu Oct 25 08:40:00 2018 +0200 ---------------------------------------------------------------------- .../s3/TestS3ImportWithHadoopCredProvider.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/7f61ae21/src/test/org/apache/sqoop/s3/TestS3ImportWithHadoopCredProvider.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/s3/TestS3ImportWithHadoopCredProvider.java b/src/test/org/apache/sqoop/s3/TestS3ImportWithHadoopCredProvider.java index e03eb64..3a0d636 100644 --- a/src/test/org/apache/sqoop/s3/TestS3ImportWithHadoopCredProvider.java +++ b/src/test/org/apache/sqoop/s3/TestS3ImportWithHadoopCredProvider.java @@ -78,11 +78,11 @@ public class TestS3ImportWithHadoopCredProvider extends ImportJobTestCase { String generatorCommand = S3TestUtils.getGeneratorCommand(); if (generatorCommand != null) { s3CredentialGenerator = new DefaultS3CredentialGenerator(generatorCommand); + generateTempProviderFileNames(); + fillCredentialProviderDefault(); + fillCredentialProviderPwdFile(); + fillCredentialProviderEnv(); } - generateTempProviderFileNames(); - fillCredentialProviderDefault(); - fillCredentialProviderPwdFile(); - fillCredentialProviderEnv(); } @Before @@ -102,9 +102,9 @@ public class TestS3ImportWithHadoopCredProvider extends ImportJobTestCase { @AfterClass public static void deleteTemporaryCredFiles() { - providerFileDefault.deleteOnExit(); - providerFileEnvPwd.deleteOnExit(); - providerFilePwdFile.deleteOnExit(); + deleteFileOnExit(providerFileDefault); + deleteFileOnExit(providerFileEnvPwd); + deleteFileOnExit(providerFilePwdFile); } @Test @@ -210,4 +210,10 @@ public class TestS3ImportWithHadoopCredProvider extends ImportJobTestCase { private static void setHadoopCredStorePwdEnvVar() { environmentVariables.set(HADOOP_CREDSTORE_PASSWORD_ENV_NAME, "credProviderPwd"); } + + private static void deleteFileOnExit(File file) { + if (file != null) { + file.deleteOnExit(); + } + } }
