Improve JDBC integration tests #1747
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit cf63315.
to make things robust
komamitsu
changed the title
komamitsu
commented
May 20, 2024
| @@ -56,6 +56,7 @@ sourceSets { | |||
| compileClasspath += main.output + test.output | |||
| runtimeClasspath += main.output + test.output | |||
| srcDir file('src/integration-test/java') | |||
| include '**/com/scalar/db/storage/jdbc/*.java' | |||
There was a problem hiding this comment.
integrationTestMultiStorage needs to be able to access com.scalar.db.storage.jdbc.JdbcTestUtils
| // - Create a new method to retry only for the method | ||
| Uninterruptibles.sleepUninterruptibly(10000, TimeUnit.MILLISECONDS); | ||
| if (JdbcTestUtils.isYugabyte(rdbEngine)) { | ||
| Uninterruptibles.sleepUninterruptibly(1000, TimeUnit.MILLISECONDS); |
There was a problem hiding this comment.
With the retry, such a long wait is no longer needed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
In the current JDBC integration tests, there is room to improve a few points.
RdbEngineStrategy.toString()or equivalent to know the actual class (RdbEngineXxxxxx) that implementsRdbEngineStrategyinterface sinceRdbEngineXxxxxxs are package-private. These string comparisons can be replaced with class type comparison.SchemaLoaderIntegrationTestBase#createTablesThenDeleteTables_ShouldExecuteProperly()with YugabyteDB sometimes failed even with 10 seconds wait (e.g., https://github.com/scalar-labs/scalardb/actions/runs/9123522841/job/25086080469). We need to manually retry failed job in this case. We've already found retrying for the test case works well.Related issues and/or PRs
https://github.com/scalar-labs/scalardb/pull/1744/files#r1603305279
Changes made
JdbcTestUtils.ixXxxxxx(RdbEngineStrategy)SchemaLoaderIntegrationTestBase#createTablesThenDeleteTables_ShouldExecuteProperly()to retry in the case of YugabyteDB. Also, the 10 second wait can be reduced to 1 second.Checklist
Additional notes (optional)
None
Release notes
N/A