summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2020-04-06 16:00:37 +0000
committerTom Lane2020-04-06 16:00:37 +0000
commit3c8553547b1493c4afdb80393f4a47dbfa019a79 (patch)
tree6880bd25cf0e025133a8547750daedaca43d55b5
parentf1ac27bfda6ce8a399d8001843e9aefff5814f9b (diff)
Re-stabilize infinite_recurse() test case.
Since commit 8f59f6b9c0, CLOBBER_CACHE_ALWAYS buildfarm members have been failing this test case because the error message now sometimes includes an error cursor position. It seems largely just luck that that never happened before, and there are likely to be more ways it could happen in future. Hence, rather than trying to prevent it, adjust the test script to suppress that component of the report. At some point we might need to back-patch this, but refrain until there's a demonstrated need. (We'd need a different fix before v12, anyway, since VERBOSITY=sqlstate is a recent thing.) Tom Lane and Andres Freund Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/test/regress/expected/errors.out9
-rw-r--r--src/test/regress/sql/errors.sql6
2 files changed, 10 insertions, 5 deletions
diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out
index 7dd8a5b33e4..a525aa2f937 100644
--- a/src/test/regress/expected/errors.out
+++ b/src/test/regress/expected/errors.out
@@ -441,9 +441,12 @@ ERROR: syntax error at or near "NUL"
LINE 16: ...L, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 I...
^
-- Check that stack depth detection mechanism works and
--- max_stack_depth is not set too high
+-- max_stack_depth is not set too high. The full error report is not
+-- very stable, so show only SQLSTATE and primary error message.
create function infinite_recurse() returns int as
'select infinite_recurse()' language sql;
-\set VERBOSITY terse
+\set VERBOSITY sqlstate
select infinite_recurse();
-ERROR: stack depth limit exceeded
+ERROR: 54001
+\echo :LAST_ERROR_MESSAGE
+stack depth limit exceeded
diff --git a/src/test/regress/sql/errors.sql b/src/test/regress/sql/errors.sql
index 792c29c64b5..86b672538a1 100644
--- a/src/test/regress/sql/errors.sql
+++ b/src/test/regress/sql/errors.sql
@@ -366,8 +366,10 @@ NOT
NULL);
-- Check that stack depth detection mechanism works and
--- max_stack_depth is not set too high
+-- max_stack_depth is not set too high. The full error report is not
+-- very stable, so show only SQLSTATE and primary error message.
create function infinite_recurse() returns int as
'select infinite_recurse()' language sql;
-\set VERBOSITY terse
+\set VERBOSITY sqlstate
select infinite_recurse();
+\echo :LAST_ERROR_MESSAGE