Commit fa03769e authored by Peter Eisentraut's avatar Peter Eisentraut

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.
parent 8f9be261
...@@ -134,7 +134,7 @@ with plpy.subtransaction(): ...@@ -134,7 +134,7 @@ with plpy.subtransaction():
except plpy.SPIError, e: except plpy.SPIError, e:
if not swallow: if not swallow:
raise raise
plpy.notice("Swallowed %r" % e) plpy.notice("Swallowed %s(%r)" % (e.__class__.__name__, e.args[0]))
return "ok" return "ok"
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;
SELECT subtransaction_nested_test(); SELECT subtransaction_nested_test();
...@@ -153,7 +153,7 @@ SELECT * FROM subtransaction_tbl; ...@@ -153,7 +153,7 @@ SELECT * FROM subtransaction_tbl;
TRUNCATE subtransaction_tbl; TRUNCATE subtransaction_tbl;
SELECT subtransaction_nested_test('t'); SELECT subtransaction_nested_test('t');
NOTICE: Swallowed SyntaxError('syntax error at or near "error"',) NOTICE: Swallowed SyntaxError('syntax error at or near "error"')
subtransaction_nested_test subtransaction_nested_test
---------------------------- ----------------------------
ok ok
...@@ -178,7 +178,7 @@ with plpy.subtransaction(): ...@@ -178,7 +178,7 @@ with plpy.subtransaction():
return "ok" return "ok"
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;
SELECT subtransaction_deeply_nested_test(); SELECT subtransaction_deeply_nested_test();
NOTICE: Swallowed SyntaxError('syntax error at or near "error"',) NOTICE: Swallowed SyntaxError('syntax error at or near "error"')
subtransaction_deeply_nested_test subtransaction_deeply_nested_test
----------------------------------- -----------------------------------
ok ok
......
...@@ -80,7 +80,7 @@ with plpy.subtransaction(): ...@@ -80,7 +80,7 @@ with plpy.subtransaction():
except plpy.SPIError, e: except plpy.SPIError, e:
if not swallow: if not swallow:
raise raise
plpy.notice("Swallowed %r" % e) plpy.notice("Swallowed %s(%r)" % (e.__class__.__name__, e.args[0]))
return "ok" return "ok"
$$ LANGUAGE plpythonu; $$ LANGUAGE plpythonu;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment