summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2014-06-01 15:03:18 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2014-06-01 15:03:18 -0400
commit582b41d6e21dd1324c2bab67ace04b74591f8dd9 (patch)
tree20645d51e8e19dcad69e14ae8965fa8c6dccd9e7 /src
parent83ed4598b251f05f01fb7ea1d562b2a96830d738 (diff)
PL/Python: Adjust the regression tests for Python 3.4
Back-patch commit d0765d50f429472d00554701ac6531c84d324811 into 9.3 and 9.2, which is as far back as we previously bothered to adjust the regression tests for Python 3.3. Per gripe from Honza Horak.
Diffstat (limited to 'src')
-rw-r--r--src/pl/plpython/.gitignore1
-rw-r--r--src/pl/plpython/expected/plpython_do.out6
-rw-r--r--src/pl/plpython/sql/plpython_do.sql2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/pl/plpython/.gitignore b/src/pl/plpython/.gitignore
index 07bee6a29c4..abba0cf5974 100644
--- a/src/pl/plpython/.gitignore
+++ b/src/pl/plpython/.gitignore
@@ -3,3 +3,4 @@
/log/
/results/
/tmp_check/
+/python3/
diff --git a/src/pl/plpython/expected/plpython_do.out b/src/pl/plpython/expected/plpython_do.out
index d979cf811c7..09778120843 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 <module>
- 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 beb443f95d1..0e281a08ee8 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;