Skip to content

Commit 22d4e8d

Browse files
committed
skip remaining commitProtocol tests
1 parent 122dd59 commit 22d4e8d

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/staging/integration/ITestDirectoryCommitProtocol.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,21 @@
3535
import org.apache.hadoop.mapreduce.JobStatus;
3636
import org.apache.hadoop.mapreduce.TaskAttemptContext;
3737

38+
import static org.apache.hadoop.fs.s3a.S3ATestUtils.skipIfAnalyticsAcceleratorEnabled;
3839
import static org.apache.hadoop.fs.s3a.commit.CommitConstants.CONFLICT_MODE_APPEND;
3940
import static org.apache.hadoop.fs.s3a.commit.CommitConstants.FS_S3A_COMMITTER_STAGING_CONFLICT_MODE;
4041
import static org.apache.hadoop.fs.s3a.commit.CommitConstants.S3A_COMMITTER_EXPERIMENTAL_COLLECT_IOSTATISTICS;
4142

4243
/** ITest of the low level protocol methods. */
4344
public class ITestDirectoryCommitProtocol extends ITestStagingCommitProtocol {
4445

46+
47+
@Override
48+
public void setup() throws Exception {
49+
super.setup();
50+
skipIfAnalyticsAcceleratorEnabled(getConfiguration());
51+
}
52+
4553
@Override
4654
protected String suitename() {
4755
return "ITestDirectoryCommitProtocol";

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/staging/integration/ITestStagingCommitProtocol.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.apache.hadoop.mapreduce.JobStatus;
4242
import org.apache.hadoop.mapreduce.TaskAttemptContext;
4343

44+
import static org.apache.hadoop.fs.s3a.S3ATestUtils.skipIfAnalyticsAcceleratorEnabled;
4445
import static org.apache.hadoop.fs.s3a.commit.CommitConstants.*;
4546

4647
/** Test the staging committer's handling of the base protocol operations. */
@@ -65,6 +66,8 @@ protected Configuration createConfiguration() {
6566
@Override
6667
public void setup() throws Exception {
6768
super.setup();
69+
skipIfAnalyticsAcceleratorEnabled(getConfiguration());
70+
6871

6972
// identify working dir for staging and delete
7073
Configuration conf = getConfiguration();

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/staging/integration/ITestStagingCommitProtocolFailure.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
3333

3434
import static org.apache.hadoop.fs.s3a.Constants.MULTIPART_UPLOADS_ENABLED;
35-
import static org.apache.hadoop.fs.s3a.S3ATestUtils.disableFilesystemCaching;
36-
import static org.apache.hadoop.fs.s3a.S3ATestUtils.getTestBucketName;
37-
import static org.apache.hadoop.fs.s3a.S3ATestUtils.removeBucketOverrides;
35+
import static org.apache.hadoop.fs.s3a.S3ATestUtils.*;
3836
import static org.apache.hadoop.fs.s3a.commit.CommitConstants.FS_S3A_COMMITTER_NAME;
3937
import static org.apache.hadoop.fs.s3a.commit.CommitConstants.S3A_COMMITTER_FACTORY_KEY;
4038
import static org.apache.hadoop.test.LambdaTestUtils.intercept;
@@ -45,6 +43,13 @@
4543
*/
4644
public class ITestStagingCommitProtocolFailure extends AbstractS3ATestBase {
4745

46+
47+
@Override
48+
public void setup() throws Exception {
49+
super.setup();
50+
skipIfAnalyticsAcceleratorEnabled(getConfiguration());
51+
}
52+
4853
@Override
4954
protected Configuration createConfiguration() {
5055
Configuration conf = super.createConfiguration();

0 commit comments

Comments
 (0)