NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitfa03769

committed

Tweak tests to support Python 3.7

Python 3.7 removes the trailing comma in the repr() ofBaseException (see <https://bugs.python.org/issue30399>), leading totest output differences. Work around that by composing the equivalenttest output in a more manual way.

1 parent8f9be26 commitfa03769Copy full SHA for fa03769

File tree

2 files changed

-4

lines changed

src/pl/plpython
- expected
  - plpython_subtransaction.out
- sql
  - plpython_subtransaction.sql

2 files changed

-4

lines changed

`‎src/pl/plpython/expected/plpython_subtransaction.out`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ with plpy.subtransaction():`
`134`	`134`	`except plpy.SPIError, e:`
`135`	`135`	`if not swallow:`
`136`	`136`	`raise`
`137`		`- plpy.notice("Swallowed %r" %e)`
	`137`	`+ plpy.notice("Swallowed %s(%r)" %(e.__class__.__name__, e.args[0]))`
`138`	`138`	`return "ok"`
`139`	`139`	`$$ LANGUAGE plpythonu;`
`140`	`140`	`SELECT subtransaction_nested_test();`
`@@ -153,7 +153,7 @@ SELECT * FROM subtransaction_tbl;`
`153`	`153`
`154`	`154`	`TRUNCATE subtransaction_tbl;`
`155`	`155`	`SELECT subtransaction_nested_test('t');`
`156`		`-NOTICE: Swallowed SyntaxError('syntax error at or near "error"',)`
	`156`	`+NOTICE: Swallowed SyntaxError('syntax error at or near "error"')`
`157`	`157`	`subtransaction_nested_test`
`158`	`158`	`----------------------------`
`159`	`159`	`ok`
`@@ -178,7 +178,7 @@ with plpy.subtransaction():`
`178`	`178`	`return "ok"`
`179`	`179`	`$$ LANGUAGE plpythonu;`
`180`	`180`	`SELECT subtransaction_deeply_nested_test();`
`181`		`-NOTICE: Swallowed SyntaxError('syntax error at or near "error"',)`
	`181`	`+NOTICE: Swallowed SyntaxError('syntax error at or near "error"')`
`182`	`182`	`subtransaction_deeply_nested_test`
`183`	`183`	`-----------------------------------`
`184`	`184`	`ok`

`‎src/pl/plpython/sql/plpython_subtransaction.sql`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ with plpy.subtransaction():`
`80`	`80`	`exceptplpy.SPIError, e:`
`81`	`81`	`if not swallow:`
`82`	`82`	`raise`
`83`		`-plpy.notice("Swallowed %r" %e)`
	`83`	`+plpy.notice("Swallowed %s(%r)" %(e.__class__.__name__,e.args[0]))`
`84`	`84`	`return"ok"`
`85`	`85`	`$$ LANGUAGE plpythonu;`
`86`	`86`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfa03769

File tree

2 files changed

2 files changed

`‎src/pl/plpython/expected/plpython_subtransaction.out`

`‎src/pl/plpython/sql/plpython_subtransaction.sql`

0 commit comments