From d0765d50f429472d00554701ac6531c84d324811 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 29 Apr 2014 22:16:16 -0400 Subject: [PATCH] PL/Python: Adjust the regression tests for Python 3.4 The error test case in the plpython_do test resulted in a slightly different error message with Python 3.4. So pick a different way to test it that avoids that and is perhaps also a bit clearer. --- src/pl/plpython/expected/plpython_do.out | 6 +++--- src/pl/plpython/sql/plpython_do.sql | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pl/plpython/expected/plpython_do.out b/src/pl/plpython/expected/plpython_do.out index d979cf811c..0977812084 100644 --- a/src/pl/plpython/expected/plpython_do.out +++ b/src/pl/plpython/expected/plpython_do.out @@ -4,9 +4,9 @@ CONTEXT: PL/Python anonymous code block DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u; NOTICE: This is plpython2u. CONTEXT: PL/Python anonymous code block -DO $$ nonsense $$ LANGUAGE plpythonu; -ERROR: NameError: global name 'nonsense' is not defined +DO $$ raise Exception("error test") $$ LANGUAGE plpythonu; +ERROR: Exception: error test CONTEXT: Traceback (most recent call last): PL/Python anonymous code block, line 1, in - nonsense + raise Exception("error test") PL/Python anonymous code block diff --git a/src/pl/plpython/sql/plpython_do.sql b/src/pl/plpython/sql/plpython_do.sql index beb443f95d..0e281a08ee 100644 --- a/src/pl/plpython/sql/plpython_do.sql +++ b/src/pl/plpython/sql/plpython_do.sql @@ -2,4 +2,4 @@ DO $$ plpy.notice("This is plpythonu.") $$ LANGUAGE plpythonu; DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u; -DO $$ nonsense $$ LANGUAGE plpythonu; +DO $$ raise Exception("error test") $$ LANGUAGE plpythonu;