mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-27 18:57:18 +02:00
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.
This commit is contained in:
parent
7ff50cf60b
commit
ab7825eadf
@ -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"')
|
||||
subtransaction_nested_test
|
||||
----------------------------
|
||||
ok
|
||||
@ -178,7 +178,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"')
|
||||
subtransaction_deeply_nested_test
|
||||
-----------------------------------
|
||||
ok
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user