--- FAIL: TestSavepoints (8.82s)
=== RUN   TestSavepoints/rollback_after_lock_timeout
    datadriven.go:263: 
        /mnt/engflow/worker/work/0/exec/bazel-out/k8-fastbuild/bin/pkg/sql/sql_test_/sql_test.runfiles/com_github_cockroachdb_cockroach/pkg/sql/testdata/savepoints:250:
          sql
          CREATE TABLE t(x INT PRIMARY KEY)
          ----
          1: CREATE TABLE t(x INT PRIMARY KEY) -- 0 rows
          -- NoTxn       -> NoTxn       #  (none)
    datadriven.go:263: 
        /mnt/engflow/worker/work/0/exec/bazel-out/k8-fastbuild/bin/pkg/sql/sql_test_/sql_test.runfiles/com_github_cockroachdb_cockroach/pkg/sql/testdata/savepoints:256:
          sql conn=conflict
          BEGIN
          INSERT INTO t VALUES (1)
          ----
          1: BEGIN -- 0 rows
          -- NoTxn       -> Open        #.  (none)
          2: INSERT INTO t VALUES (1) -- 1 row
          -- Open        -> Open        ##  (none)
    datadriven.go:263: 
          /mnt/engflow/worker/work/0/exec/bazel-out/k8-fastbuild/bin/pkg/sql/sql_test_/sql_test.runfiles/com_github_cockroachdb_cockroach/pkg/sql/testdata/savepoints:265:
          sql
          SET lock_timeout = '100ms'
          BEGIN
          SAVEPOINT foo
          SELECT * FROM t WHERE x = 1 FOR UPDATE
          ROLLBACK TO SAVEPOINT foo
          SELECT * FROM t WHERE x = 2 FOR UPDATE
          COMMIT
          SET lock_timeout = 0
        output didn't match expected:
          @@ -2,14 +2,14 @@
           -- NoTxn       -> NoTxn       #.......  (none)
           2: BEGIN -- 0 rows
           -- NoTxn       -> Open        ##......  (none)
           3: SAVEPOINT foo -- 0 rows
           -- Open        -> Open        ###.....  foo
          -4: SELECT * FROM t WHERE x = 1 FOR UPDATE -- pq: canceling statement due to lock timeout on row (x)=(1) in t@t_pkey
          --- Open        -> Aborted     XXXXXXXX  foo
          +4: SELECT * FROM t WHERE x = 1 FOR UPDATE -- 0 rows
          +-- Open        -> Open        ####....  foo
           5: ROLLBACK TO SAVEPOINT foo -- 0 rows
          --- Aborted     -> Open        ###.....  foo
          +-- Open        -> Open        ###.....  foo
           6: SELECT * FROM t WHERE x = 2 FOR UPDATE -- 0 rows
           -- Open        -> Open        ###..#..  foo
           7: COMMIT -- 0 rows
           -- Open        -> NoTxn       ###..##.  (none)
           8: SET lock_timeout = 0 -- 0 rows
--- FAIL: TestSavepoints/rollback_after_lock_timeout (0.65s)