PL/Python: Adjust the regression tests for Python 3.4

petere · petere · commit d0765d50f429 · 2014-04-29T22:16:16.000-04:00
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.
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ DO $$ plpy.notice("This is plpythonu.") $$ LANGUAGE plpythonu;`
`2`	`2`
`3`	`3`	`DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;`
`4`	`4`
`5`		`-DO $$ nonsense $$ LANGUAGE plpythonu;`
	`5`	`+DO $$ raise Exception("error test") $$ LANGUAGE plpythonu;`