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.

diff --git a/src/pl/plpython/.gitignore b/src/pl/plpython/.gitignore
index 07bee6a29c4e2fc21d2d21ba3587709bda13999a..abba0cf5974459e349d573e2145134078a3bcca4 100644 (file)
--- 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 d979cf811c7a97f807b35cfe973f82e7cba0e04a..09778120843021c479b6042627ff3096204b3928 100644 (file)
--- 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 beb443f95d1b4e2705a37a74d14fcf2451a87241..0e281a08ee8cab26178e661888f8c408717d2876 100644 (file)
--- 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;