diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2018-02-13 16:13:20 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2018-05-05 23:53:05 -0400 |
| commit | af9e0d5cdf385d3924e8a8569df6b8314848e242 (patch) | |
| tree | ab260d24541994057caee142de94db1fc8f57adb | |
| parent | 280cf0fe789d8ea2fdc3b8e374bfd82f674264de (diff) | |
Tweak tests to support Python 3.7
Python 3.7 removes the trailing comma in the repr() of
BaseException (see <https://bugs.python.org/issue30399>), leading to
test output differences. Work around that by composing the equivalent
test output in a more manual way.
4 files changed, 6 insertions, 6 deletions
diff --git a/src/pl/plpython/expected/plpython_subtransaction.out b/src/pl/plpython/expected/plpython_subtransaction.out index 0a2599f288d..1ea1c8ea6ef 100644 --- a/src/pl/plpython/expected/plpython_subtransaction.out +++ b/src/pl/plpython/expected/plpython_subtransaction.out @@ -134,7 +134,7 @@ with plpy.subtransaction(): except plpy.SPIError, e: if not swallow: raise - plpy.notice("Swallowed %r" % e) + plpy.notice("Swallowed %s(%r)" % (e.__class__.__name__, e.args[0])) return "ok" $$ LANGUAGE plpythonu; SELECT subtransaction_nested_test(); @@ -153,7 +153,7 @@ SELECT * FROM subtransaction_tbl; TRUNCATE subtransaction_tbl; SELECT subtransaction_nested_test('t'); -NOTICE: Swallowed SyntaxError('syntax error at or near "error"',) +NOTICE: Swallowed SyntaxError('syntax error at or near "error"') CONTEXT: PL/Python function "subtransaction_nested_test" subtransaction_nested_test ---------------------------- @@ -179,7 +179,7 @@ with plpy.subtransaction(): return "ok" $$ LANGUAGE plpythonu; SELECT subtransaction_deeply_nested_test(); -NOTICE: Swallowed SyntaxError('syntax error at or near "error"',) +NOTICE: Swallowed SyntaxError('syntax error at or near "error"') CONTEXT: PL/Python function "subtransaction_nested_test" SQL statement "SELECT subtransaction_nested_test('t')" PL/Python function "subtransaction_deeply_nested_test" diff --git a/src/pl/plpython/expected/plpython_subtransaction_0.out b/src/pl/plpython/expected/plpython_subtransaction_0.out index 73bd7242bd8..631a2243324 100644 --- a/src/pl/plpython/expected/plpython_subtransaction_0.out +++ b/src/pl/plpython/expected/plpython_subtransaction_0.out @@ -128,7 +128,7 @@ with plpy.subtransaction(): except plpy.SPIError, e: if not swallow: raise - plpy.notice("Swallowed %r" % e) + plpy.notice("Swallowed %s(%r)" % (e.__class__.__name__, e.args[0])) return "ok" $$ LANGUAGE plpythonu; ERROR: could not compile PL/Python function "subtransaction_nested_test" diff --git a/src/pl/plpython/expected/plpython_subtransaction_5.out b/src/pl/plpython/expected/plpython_subtransaction_5.out index d1776200d22..ed14dbeb857 100644 --- a/src/pl/plpython/expected/plpython_subtransaction_5.out +++ b/src/pl/plpython/expected/plpython_subtransaction_5.out @@ -128,7 +128,7 @@ with plpy.subtransaction(): except plpy.SPIError, e: if not swallow: raise - plpy.notice("Swallowed %r" % e) + plpy.notice("Swallowed %s(%r)" % (e.__class__.__name__, e.args[0])) return "ok" $$ LANGUAGE plpythonu; ERROR: could not compile PL/Python function "subtransaction_nested_test" diff --git a/src/pl/plpython/sql/plpython_subtransaction.sql b/src/pl/plpython/sql/plpython_subtransaction.sql index 3c188e3dd2d..398c65720ce 100644 --- a/src/pl/plpython/sql/plpython_subtransaction.sql +++ b/src/pl/plpython/sql/plpython_subtransaction.sql @@ -80,7 +80,7 @@ with plpy.subtransaction(): except plpy.SPIError, e: if not swallow: raise - plpy.notice("Swallowed %r" % e) + plpy.notice("Swallowed %s(%r)" % (e.__class__.__name__, e.args[0])) return "ok" $$ LANGUAGE plpythonu; |