Skip to content

Commit

Permalink
roachtest: Pin pgx to 4.6.0
Browse files Browse the repository at this point in the history 
Release note: None
  • Loading branch information
@apantel
apantel committed Jun 11, 2020
1 parent 408952f commit d63c400
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 40 deletions.
4 changes: 3 additions & 1 deletion pkg/cmd/roachtest/pgx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
)

var pgxReleaseTagRegex = regexp.MustCompile(`^v(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)$`)
var supportedTag = "v4.6.0"

// This test runs pgx's full test suite against a single cockroach node.

Expand Down Expand Up @@ -58,6 +59,7 @@ func registerPgx(r *testRegistry) {
t.Fatal(err)
}
c.l.Printf("Latest jackc/pgx release is %s.", latestTag)
c.l.Printf("Supported release is %s.", supportedTag)

t.Status("installing go-junit-report")
if err := repeatRunE(
Expand Down Expand Up @@ -109,7 +111,7 @@ func registerPgx(r *testRegistry) {
results := newORMTestsResults()
results.parseJUnitXML(t, expectedFailures, ignorelist, xmlResults)
results.summarizeAll(
t, "pgx", blocklistName, expectedFailures, version, latestTag,
t, "pgx", blocklistName, expectedFailures, version, supportedTag,
)
}

Expand Down
97 changes: 58 additions & 39 deletions pkg/cmd/roachtest/pgx_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,45 +22,64 @@ var pgxBlocklists = blocklistsForVersion{
var pgxBlocklist20_2 = pgxBlocklist20_1

var pgxBlocklist20_1 = blocklist{
"v4.Example_CustomType": "27796",
"v4.TestConnBeginBatchDeferredError": "31632",
"v4.TestConnCopyFromFailServerSideMidway": "19603",
"v4.TestConnCopyFromJSON": "19603",
"v4.TestConnCopyFromLarge": "19603",
"v4.TestConnCopyFromSmall": "19603",
"v4.TestConnQueryDeferredError": "31632",
"v4.TestConnQueryErrorWhileReturningRows": "26925",
"v4.TestConnQueryReadRowMultipleTimes": "26925",
"v4.TestConnQueryValues": "26925",
"v4.TestConnQueryValuesWithUnknownOID": "26925",
"v4.TestConnSendBatch": "44712",
"v4.TestConnSendBatchWithPreparedStatement": "41558",
"v4.TestConnSimpleProtocol": "21286",
"v4.TestConnSimpleProtocolRefusesNonStandardConformingStrings": "36215",
"v4.TestConnSimpleProtocolRefusesNonUTF8ClientEncoding": "37129",
"v4.TestDomainType": "27796",
"v4.TestFatalRxError": "35897",
"v4.TestFatalTxError": "35897",
"v4.TestInetCIDRArrayTranscodeIP": "18846",
"v4.TestInetCIDRArrayTranscodeIPNet": "18846",
"v4.TestInetCIDRTranscodeIP": "18846",
"v4.TestInetCIDRTranscodeIPNet": "18846",
"v4.TestInetCIDRTranscodeWithJustIP": "18846",
"v4.TestLargeObjects": "26725",
"v4.TestLargeObjectsMultipleTransactions": "26725",
"v4.TestLargeObjectsPreferSimpleProtocol": "26725",
"v4.TestListenNotify": "41522",
"v4.TestListenNotifySelfNotification": "41522",
"v4.TestListenNotifyWhileBusyIsSafe": "41522",
"v4.TestQueryContextErrorWhileReceivingRows": "26925",
"v4.TestRowDecode": "26925",
"v4.TestTransactionSuccessfulCommit": "31632",
"v4.TestTransactionSuccessfulRollback": "31632",
"v4.TestTxCommitSerializationFailure": "12701",
"v4.TestTxCommitWhenTxBroken": "31632",
"v4.TestTxNestedTransactionCommit": "31632",
"v4.TestTxNestedTransactionRollback": "31632",
"v4.TestUnregisteredTypeUsableAsStringArgumentAndBaseResult": "27796",
"v4.Example_CustomType": "27796",
"v4.TestConnBeginBatchDeferredError": "31632",
"v4.TestConnCopyFromEnum": "unknown",
"v4.TestConnCopyFromJSON": "19603",
"v4.TestConnCopyFromLarge": "19603",
"v4.TestConnCopyFromSmall": "19603",
"v4.TestConnQueryDeferredError": "31632",
"v4.TestConnQueryErrorWhileReturningRows": "26925",
"v4.TestConnQueryReadRowMultipleTimes": "26925",
"v4.TestConnQueryValues": "26925",
"v4.TestConnQueryValuesWithUnknownOID": "26925",
"v4.TestConnSendBatch": "44712",
"v4.TestConnSendBatchWithPreparedStatement": "41558",
"v4.TestConnSimpleProtocol": "21286",
"v4.TestConnSimpleProtocolRefusesNonStandardConformingStrings": "36215",
"v4.TestConnSimpleProtocolRefusesNonUTF8ClientEncoding": "37129",
"v4.TestDomainType": "27796",
"v4.TestDomainType/DefaultProto": "unknown",
"v4.TestDomainType/SimpleProto": "unknown",
"v4.TestFatalRxError": "35897",
"v4.TestFatalTxError": "35897",
"v4.TestInetCIDRArrayTranscodeIP": "18846",
"v4.TestInetCIDRArrayTranscodeIP/DefaultProto": "unknown",
"v4.TestInetCIDRArrayTranscodeIP/SimpleProto": "unknown",
"v4.TestInetCIDRArrayTranscodeIPNet": "18846",
"v4.TestInetCIDRArrayTranscodeIPNet/DefaultProto": "unknown",
"v4.TestInetCIDRArrayTranscodeIPNet/SimpleProto": "unknown",
"v4.TestInetCIDRTranscodeIP": "18846",
"v4.TestInetCIDRTranscodeIP/DefaultProto": "unknown",
"v4.TestInetCIDRTranscodeIP/SimpleProto": "unknown",
"v4.TestInetCIDRTranscodeIPNet": "18846",
"v4.TestInetCIDRTranscodeIPNet/DefaultProto": "unknown",
"v4.TestInetCIDRTranscodeIPNet/SimpleProto": "unknown",
"v4.TestInetCIDRTranscodeWithJustIP": "18846",
"v4.TestInetCIDRTranscodeWithJustIP/DefaultProto": "unknown",
"v4.TestInetCIDRTranscodeWithJustIP/SimpleProto": "unknown",
"v4.TestInsertBoolArray": "unknown",
"v4.TestInsertBoolArray/SimpleProto": "unknown",
"v4.TestInsertTimestampArray": "unknown",
"v4.TestInsertTimestampArray/SimpleProto": "unknown",
"v4.TestLargeObjects": "26725",
"v4.TestLargeObjectsMultipleTransactions": "26725",
"v4.TestLargeObjectsPreferSimpleProtocol": "26725",
"v4.TestListenNotify": "41522",
"v4.TestListenNotifySelfNotification": "41522",
"v4.TestListenNotifyWhileBusyIsSafe": "41522",
"v4.TestQueryContextErrorWhileReceivingRows": "26925",
"v4.TestRowDecodeBinary": "unknown",
"v4.TestSendBatchSimpleProtocol": "unknown",
"v4.TestTransactionSuccessfulCommit": "31632",
"v4.TestTransactionSuccessfulRollback": "31632",
"v4.TestTxCommitSerializationFailure": "12701",
"v4.TestTxCommitWhenTxBroken": "31632",
"v4.TestTxNestedTransactionCommit": "31632",
"v4.TestTxNestedTransactionRollback": "31632",
"v4.TestUnregisteredTypeUsableAsStringArgumentAndBaseResult": "27796",
"v4.TestUnregisteredTypeUsableAsStringArgumentAndBaseResult/DefaultProto": "unknown",
"v4.TestUnregisteredTypeUsableAsStringArgumentAndBaseResult/SimpleProto": "unknown",
}

var pgxIgnorelist20_2 = pgxIgnorelist20_1
Expand Down

0 comments on commit d63c400

Please sign in to comment.