Skip to content

roachtest: fix pgjdbc and typeorm #81552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craig merged 2 commits into from
May 20, 2022
Merged

roachtest: fix pgjdbc and typeorm #81552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d09b05
roachtest: fix pgjdbc test
rafiss May 19, 2022
7201cc9
roachtest: tolerate some transaction retry errors in typeorm
rafiss May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions pkg/cmd/roachtest/tests/pgjdbc_blocklist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,35 +542,8 @@ var pgjdbcBlockList22_1 = blocklist{
"org.postgresql.test.jdbc2.TimezoneTest.testSetDate": "41776",
"org.postgresql.test.jdbc2.TimezoneTest.testSetTime": "41776",
"org.postgresql.test.jdbc2.TimezoneTest.testSetTimestamp": "41776",
"org.postgresql.test.jdbc2.UpdateableResultTest.simpleAndUpdateableSameQuery": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.test2193": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testArray": "26925",
"org.postgresql.test.jdbc2.UpdateableResultTest.testBadColumnIndexes": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testCancelRowUpdates": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testDeleteRows": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testInsertRowIllegalMethods": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testMultiColumnUpdate": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testMultiColumnUpdateWithoutAllColumns": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testMultiColumnUpdateWithoutPrimaryKey": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testNoUniqueNotUpdateable": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testOidUpdatable": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testPositioning": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testPrimaryAndUniqueUpdateableByPrimary": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testPrimaryAndUniqueUpdateableByUnique": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testReturnSerial": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUniqueWithNotNullableColumnUpdateable": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUniqueWithNullAndNotNullableColumnUpdateable": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUniqueWithNullableColumnNotUpdateable": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUniqueWithNullableColumnsNotUpdatable": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateBoolean": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateDate": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateReadOnlyResultSet": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateSelectOnly": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateStreams": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateTimestamp": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateable": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateablePreparedStatement": "unknown",
"org.postgresql.test.jdbc2.UpdateableResultTest.testZeroRowResult": "unknown",
"org.postgresql.test.jdbc3.CompositeTest.testComplexArgumentSelect": "27793",
"org.postgresql.test.jdbc3.CompositeTest.testComplexSelect": "27793",
"org.postgresql.test.jdbc3.CompositeTest.testComplexTableNameMetadata": "27793",
Expand Down
6 changes: 4 additions & 2 deletions pkg/cmd/roachtest/tests/typeorm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,10 @@ func registerTypeORM(r registry.Registry) {
rawResults := result.Stdout + result.Stderr
t.L().Printf("Test Results: %s", rawResults)
if err != nil {
if strings.Contains(rawResults, "1 failing") &&
strings.Contains(rawResults, "Error: Cannot find connection better-sqlite3 because its not defined in any orm configuration files.") {
txnRetryErrCount := strings.Count(rawResults, "restart transaction")
if strings.Contains(rawResults, "1 failing") && txnRetryErrCount == 1 {
err = nil
} else if strings.Contains(rawResults, "2 failing") && txnRetryErrCount == 2 {
err = nil
}
if err != nil {
Expand Down