NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit75f9d17

committed

Make Python tests more portable

Newer Python versions randomize the hash seed for dictionaries,resulting in a random output order, which messes up the regression testdiffs.Instead, use Python assert to compare the dictionaries with theirexpected value.

1 parentac6f229 commit75f9d17Copy full SHA for 75f9d17

File tree

2 files changed

-16

lines changed

contrib/hstore_plpython
- expected
  - hstore_plpython.out
- sql
  - hstore_plpython.sql

2 files changed

-16

lines changed

`‎contrib/hstore_plpython/expected/hstore_plpython.out‎`

Lines changed: 4 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,10 @@ CREATE FUNCTION test1arr(val hstore[]) RETURNS int`
`43`	`43`	`LANGUAGE plpythonu`
`44`	`44`	`TRANSFORM FOR TYPE hstore`
`45`	`45`	`AS $$`
`46`		`-plpy.info(repr(val))`
	`46`	`+assert(val == [{'aa': 'bb', 'cc': None}, {'dd': 'ee'}])`
`47`	`47`	`return len(val)`
`48`	`48`	`$$;`
`49`	`49`	`SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);`
`50`		`-INFO: [{'aa': 'bb', 'cc': None}, {'dd': 'ee'}]`
`51`		`-CONTEXT: PL/Python function "test1arr"`
`52`	`50`	`test1arr`
`53`	`51`	`----------`
`54`	`52`	`2`
`@@ -88,18 +86,14 @@ LANGUAGE plpythonu`
`88`	`86`	`TRANSFORM FOR TYPE hstore`
`89`	`87`	`AS $$`
`90`	`88`	`rv = plpy.execute("SELECT 'aa=>bb, cc=>NULL'::hstore AS col1")`
`91`		`-plpy.info(repr(rv[0]["col1"]))`
	`89`	`+assert(rv[0]["col1"] == {'aa': 'bb', 'cc': None})`
`92`	`90`
`93`	`91`	`val = {'a': 1, 'b': 'boo', 'c': None}`
`94`	`92`	`plan = plpy.prepare("SELECT $1::text AS col1", ["hstore"])`
`95`	`93`	`rv = plpy.execute(plan, [val])`
`96`		`-plpy.info(repr(rv[0]["col1"]))`
	`94`	`+assert(rv[0]["col1"] == '"a"=>"1", "b"=>"boo", "c"=>NULL')`
`97`	`95`	`$$;`
`98`	`96`	`SELECT test3();`
`99`		`-INFO: {'aa': 'bb', 'cc': None}`
`100`		`-CONTEXT: PL/Python function "test3"`
`101`		`-INFO: '"a"=>"1", "b"=>"boo", "c"=>NULL'`
`102`		`-CONTEXT: PL/Python function "test3"`
`103`	`97`	`test3`
`104`	`98`	`-------`
`105`	`99`
`@@ -118,16 +112,14 @@ CREATE FUNCTION test4() RETURNS trigger`
`118`	`112`	`LANGUAGE plpythonu`
`119`	`113`	`TRANSFORM FOR TYPE hstore`
`120`	`114`	`AS $$`
`121`		`-plpy.info("Trigger row: {'a':%r, 'b':%r}" % (TD["new"]["a"], TD["new"]["b"]))`
	`115`	`+assert(TD["new"] == {'a':1, 'b':{'aa': 'bb', 'cc': None}})`
`122`	`116`	`if TD["new"]["a"] == 1:`
`123`	`117`	`TD["new"]["b"] = {'a': 1, 'b': 'boo', 'c': None}`
`124`	`118`
`125`	`119`	`return "MODIFY"`
`126`	`120`	`$$;`
`127`	`121`	`CREATE TRIGGER test4 BEFORE UPDATE ON test1 FOR EACH ROW EXECUTE PROCEDURE test4();`
`128`	`122`	`UPDATE test1 SET a = a;`
`129`		`-INFO: Trigger row: {'a': 1, 'b': {'aa': 'bb', 'cc': None}}`
`130`		`-CONTEXT: PL/Python function "test4"`
`131`	`123`	`SELECT * FROM test1;`
`132`	`124`	`a \| b`
`133`	`125`	`---+---------------------------------`

`‎contrib/hstore_plpython/sql/hstore_plpython.sql‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ CREATE FUNCTION test1arr(val hstore[]) RETURNS int`
`37`	`37`	`LANGUAGE plpythonu`
`38`	`38`	`TRANSFORM FOR TYPE hstore`
`39`	`39`	`AS $$`
`40`		`-plpy.info(repr(val))`
	`40`	`+assert(val== [{'aa':'bb','cc': None}, {'dd':'ee'}])`
`41`	`41`	`return len(val)`
`42`	`42`	`$$;`
`43`	`43`
`@@ -74,12 +74,12 @@ LANGUAGE plpythonu`
`74`	`74`	`TRANSFORM FOR TYPE hstore`
`75`	`75`	`AS $$`
`76`	`76`	`rv=plpy.execute("SELECT 'aa=>bb, cc=>NULL'::hstore AS col1")`
`77`		`-plpy.info(repr(rv[0]["col1"]))`
	`77`	`+assert(rv[0]["col1"]== {'aa':'bb','cc': None})`
`78`	`78`
`79`	`79`	`val= {'a':1,'b':'boo','c': None}`
`80`	`80`	`plan=plpy.prepare("SELECT $1::text AS col1", ["hstore"])`
`81`	`81`	`rv=plpy.execute(plan, [val])`
`82`		`-plpy.info(repr(rv[0]["col1"]))`
	`82`	`+assert(rv[0]["col1"]=='"a"=>"1", "b"=>"boo", "c"=>NULL')`
`83`	`83`	`$$;`
`84`	`84`
`85`	`85`	`SELECT test3();`
`@@ -94,7 +94,7 @@ CREATE FUNCTION test4() RETURNS trigger`
`94`	`94`	`LANGUAGE plpythonu`
`95`	`95`	`TRANSFORM FOR TYPE hstore`
`96`	`96`	`AS $$`
`97`		`-plpy.info("Trigger row: {'a':%r, 'b':%r}" % (TD["new"]["a"], TD["new"]["b"]))`
	`97`	`+assert(TD["new"]== {'a':1,'b':{'aa':'bb','cc': None}})`
`98`	`98`	`if TD["new"]["a"]==1:`
`99`	`99`	`TD["new"]["b"]= {'a':1,'b':'boo','c': None}`
`100`	`100`

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!

Commit75f9d17

File tree

2 files changed

2 files changed

`‎contrib/hstore_plpython/expected/hstore_plpython.out‎`

`‎contrib/hstore_plpython/sql/hstore_plpython.sql‎`

0 commit comments