Skip to content

Commit

Permalink
Merge #53582 #53587
Browse files Browse the repository at this point in the history 
53582: roachtest: add expected passes to PGJDBC tests r=rafiss a=rafiss

Release justification: test-only change
Release note: None

53587: sql: skip TestCancelQueryPermissions r=rytaft a=rytaft

Refs: #53584

Reason: flaky test

Generated by bin/skip-test.

Release justification: non-production code changes

Release note: None

Co-authored-by: Rafi Shamim <rafi@cockroachlabs.com>
Co-authored-by: Rebecca Taft <becca@cockroachlabs.com>
  • Loading branch information
@rafiss @rytaft
3 people committed Aug 28, 2020
3 parents d5f7fcd + c5c8a4a + 2196971 commit 123ca07
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
10 changes: 2 additions & 8 deletions pkg/cmd/roachtest/pgjdbc_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,14 +679,8 @@ var pgjdbcBlockList20_2 = 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": "53143",
"org.postgresql.test.jdbc2.UpdateableResultTest.testArray": "53143",
"org.postgresql.test.jdbc2.UpdateableResultTest.testCancelRowUpdates": "53143",
"org.postgresql.test.jdbc2.UpdateableResultTest.testMultiColumnUpdate": "53143",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateSelectOnly": "53143",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateStreams": "53143",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateTimestamp": "53143",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateable": "53143",
"org.postgresql.test.jdbc2.UpdateableResultTest.testArray": "26925",
"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateSelectOnly": "53552",
"org.postgresql.test.jdbc3.CompositeTest.testComplexArgumentSelect": "27793",
"org.postgresql.test.jdbc3.CompositeTest.testComplexSelect": "27793",
"org.postgresql.test.jdbc3.CompositeTest.testComplexTableNameMetadata": "27793",
Expand Down
2 changes: 2 additions & 0 deletions pkg/sql/run_control_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
Expand Down Expand Up @@ -299,6 +300,7 @@ GRANT admin TO has_admin2;

func TestCancelQueryPermissions(t *testing.T) {
defer leaktest.AfterTest(t)()
skip.WithIssue(t, 53584, "flaky test")
defer log.Scope(t).Close(t)

// getQueryIDs retrieves the IDs of any currently running queries for the
Expand Down

0 comments on commit 123ca07

Please sign in to comment.