adoroszlai opened a new pull request, #5679:
URL: https://github.com/apache/ozone/pull/5679
## What changes were proposed in this pull request?
Migrate the following test classes to JUnit5.
```
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFSBucketLayout.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithKeyLatestVersion.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestChunkInputStream.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReplication.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerDataScannerIntegration.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestBackgroundContainerMetadataScannerIntegration.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/scanner/TestOnDemandContainerDataScannerIntegration.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/volume/TestDatanodeHddsVolumeFailureDetection.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMBucketLayoutUpgrade.java
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMUpgradeFinalization.java
```
* Let `MiniOzoneCluster` be `AutoCloseable` so it can be used in
`try-with-resources` or close via `IOUtils.closeQuietly`
* Removed one test case from `TestOMUpgradeFinalization`, because
`TestOMBucketLayoutUpgrade` tests the same and more
* Split the only test in `TestOMBucketLayoutUpgrade` into several smaller
ones, executed on the same cluster
* `TestOzoneContainerWithTLS#testCertificateLifetime` does not need to be
parameterized (hence one less test run in that class)
* `TestReadRetries` has been running twice with the same parameter value,
since `OZONE_DEFAULT_BUCKET_LAYOUT_DEFAULT` is FSO
Before:
```
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
23.501 s - in org.apache.hadoop.fs.ozone.TestOzoneFSBucketLayout
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.47
s -- in
org.apache.hadoop.ozone.client.rpc.TestOzoneRpcClientWithKeyLatestVersion
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 52.92
s -- in org.apache.hadoop.ozone.client.rpc.TestReadRetries
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 42.82
s -- in org.apache.hadoop.ozone.client.rpc.read.TestChunkInputStream
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 188.5
s -- in org.apache.hadoop.ozone.client.rpc.read.TestKeyInputStream
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
218.542 s - in org.apache.hadoop.ozone.container.TestContainerReplication
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
43.821 s - in
org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainerWithTLS
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
18.952 s - in
org.apache.hadoop.ozone.container.ozoneimpl.TestSecureOzoneContainer
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
71.799 s - in
org.apache.hadoop.ozone.dn.scanner.TestBackgroundContainerDataScannerIntegration
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
42.873 s - in
org.apache.hadoop.ozone.dn.scanner.TestOnDemandContainerDataScannerIntegration
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
50.591 s - in
org.apache.hadoop.ozone.dn.scanner.TestBackgroundContainerMetadataScannerIntegration
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
132.022 s - in
org.apache.hadoop.ozone.dn.volume.TestDatanodeHddsVolumeFailureDetection
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
21.451 s - in org.apache.hadoop.ozone.om.TestOMBucketLayoutUpgrade
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed:
107.155 s - in org.apache.hadoop.ozone.om.TestOMUpgradeFinalization
```
After:
```
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 22.38
s -- in org.apache.hadoop.fs.ozone.TestOzoneFSBucketLayout
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.77
s -- in
org.apache.hadoop.ozone.client.rpc.TestOzoneRpcClientWithKeyLatestVersion
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.75
s -- in org.apache.hadoop.ozone.client.rpc.TestReadRetries
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 41.53
s -- in org.apache.hadoop.ozone.client.rpc.read.TestChunkInputStream
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 150.7
s -- in org.apache.hadoop.ozone.client.rpc.read.TestKeyInputStream
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 188.7
s -- in org.apache.hadoop.ozone.container.TestContainerReplication
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 46.04
s -- in org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainerWithTLS
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.00
s -- in org.apache.hadoop.ozone.container.ozoneimpl.TestSecureOzoneContainer
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 70.75
s -- in
org.apache.hadoop.ozone.dn.scanner.TestBackgroundContainerDataScannerIntegration
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 38.23
s -- in
org.apache.hadoop.ozone.dn.scanner.TestOnDemandContainerDataScannerIntegration
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 49.96
s -- in
org.apache.hadoop.ozone.dn.scanner.TestBackgroundContainerMetadataScannerIntegration
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 122.1
s -- in org.apache.hadoop.ozone.dn.volume.TestDatanodeHddsVolumeFailureDetection
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.12
s -- in org.apache.hadoop.ozone.om.TestOMBucketLayoutUpgrade
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 37.24
s -- in org.apache.hadoop.ozone.om.TestOMUpgradeFinalization
```
https://issues.apache.org/jira/browse/HDDS-9504
## How was this patch tested?
CI:
https://github.com/adoroszlai/ozone/actions/runs/7004821430
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
