FIX some tests that rely on the server knobs after interceptors

TestRetriableErrorDuringUpgradedTransaction
TestAbortCountConflictingWrites

Author: yuzefovich

Diff for: pkg/sql/conn_executor_test.go

@@ -899,6 +899,9 @@ func TestRetriableErrorDuringUpgradedTransaction(t *testing.T) {
 
 	var fooTableId uint32
 	testDB.Exec(t, "SET enable_implicit_transaction_for_batch_statements = true")
+	// The test injects a retry error after the interceptors, so we need to
+	// disable write buffers for the request to make it to the server.
+	testDB.Exec(t, "SEt kv_transaction_buffered_writes_enabled = false")
 	testDB.Exec(t, "CREATE TABLE bar (a INT PRIMARY KEY)")
 	testDB.Exec(t, "CREATE TABLE foo (a INT PRIMARY KEY)")
 	testDB.QueryRow(t, "SELECT 'foo'::regclass::oid").Scan(&fooTableId)

Diff for: pkg/sql/metric_test.go

@@ -216,6 +216,12 @@ func TestAbortCountConflictingWrites(t *testing.T) {
 
 		accum := initializeQueryCounter(s)
 
+		// The test injects a retry error after the interceptors, so we need to
+		// disable write buffers for the request to make it to the server.
+		if _, err := sqlDB.Exec("SEt kv_transaction_buffered_writes_enabled = false"); err != nil {
+			t.Fatal(err)
+		}
+
 		if _, err := sqlDB.Exec("CREATE DATABASE db"); err != nil {
 			t.Fatal(err)
 		}