Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd5ab331

michaelpq

committed

Add more $Test::Builder::Level in the TAP tests

Incrementing the level of the call stack reported is useful fordebugging purposes as it allows to control which part of the test isexactly failing, especially if a test is structured with subroutinesthat call routines from Test::More.This adds more incrementations of $Test::Builder::Level where debugginggets improved (for example it does not make sense for some paths likepg_rewind where long subroutines are used).A note is added to src/test/perl/README about that, based on asuggestion from Andrew Dunstan and a wording coming from both of us.Usage of Test::Builder::Level has spread in 12, so a backpatch down tothis version is done.Reviewed-by: Andrew Dunstan, Peter Eisentraut, Daniel GustafssonDiscussion:https://postgr.es/m/YV1CCFwgM1RV1LeS@paquier.xyzBackpatch-through: 12

1 parent2288973 commitd5ab331Copy full SHA for d5ab331

File tree

7 files changed

+21

-1

lines changed

src
- bin/pg_archivecleanup/t
  - 010_pg_archivecleanup.pl
- test
  - kerberos/t
    - 001_auth.pl
  - perl
    - README
  - recovery/t

7 files changed

+21

-1

lines changed

`‎src/bin/pg_archivecleanup/t/010_pg_archivecleanup.pl`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ sub create_files`
`69`	`69`
`70`	`70`	`subrun_check`
`71`	`71`	`{`
	`72`	`+local$Test::Builder::Level =$Test::Builder::Level + 1;`
	`73`	`+`
`72`	`74`	`my ($suffix,$test_name) =@_;`
`73`	`75`
`74`	`76`	`create_files();`

`‎src/test/kerberos/t/001_auth.pl`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,8 @@ sub test_access`
`203`	`203`	`# As above, but test for an arbitrary query result.`
`204`	`204`	`subtest_query`
`205`	`205`	`{`
	`206`	`+local$Test::Builder::Level =$Test::Builder::Level + 1;`
	`207`	`+`
`206`	`208`	`my ($node,$role,$query,$expected,$gssencmode,$test_name) =@_;`
`207`	`209`
`208`	`210`	`# need to connect over TCP/IP for Kerberos`

`‎src/test/perl/README`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,17 @@ Test::More::like entails use of the qr// operator. Avoid Perl 5.8.8 bug`
`61`	`61`	`#39185 by not using the "$" regular expression metacharacter in qr// when also`
`62`	`62`	`using the "/m" modifier. Instead of "$", use "\n" or "(?=\n\|\z)".`
`63`	`63`
`64`		`-Read the Test::More documentation for more on how to write tests:`
	`64`	`+Test::Builder::Level controls how far up in the call stack a test will look`
	`65`	`+at when reporting a failure. This should be incremented by any subroutine`
	`66`	`+which directly or indirectly calls test routines from Test::More, such as`
	`67`	`+ok() or is():`
	`68`	`+`
	`69`	`+ local $Test::Builder::Level = $Test::Builder::Level + 1;`
	`70`	`+`
	`71`	`+Read the documentation for more on how to write tests:`
`65`	`72`
`66`	`73`	`perldoc Test::More`
	`74`	`+ perldoc Test::Builder`
`67`	`75`
`68`	`76`	`For available PostgreSQL-specific test methods and some example tests read the`
`69`	`77`	`perldoc for the test modules, e.g.:`

`‎src/test/recovery/t/001_stream_rep.pl`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@`
`72`	`72`	`# target_session_attrs with multiple nodes.`
`73`	`73`	`subtest_target_session_attrs`
`74`	`74`	`{`
	`75`	`+local$Test::Builder::Level =$Test::Builder::Level + 1;`
	`76`	`+`
`75`	`77`	`my$node1 =shift;`
`76`	`78`	`my$node2 =shift;`
`77`	`79`	`my$target_node =shift;`

`‎src/test/recovery/t/003_recovery_targets.pl`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`# count to reach $num_rows, yet not later than the recovery target.`
`11`	`11`	`subtest_recovery_standby`
`12`	`12`	`{`
	`13`	`+local$Test::Builder::Level =$Test::Builder::Level + 1;`
	`14`	`+`
`13`	`15`	`my$test_name =shift;`
`14`	`16`	`my$node_name =shift;`
`15`	`17`	`my$node_master =shift;`

`‎src/test/recovery/t/007_sync_rep.pl`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`# the configuration file is reloaded before the test.`
`15`	`15`	`subtest_sync_state`
`16`	`16`	`{`
	`17`	`+local$Test::Builder::Level =$Test::Builder::Level + 1;`
	`18`	`+`
`17`	`19`	`my ($self,$expected,$msg,$setting) =@_;`
`18`	`20`
`19`	`21`	`if (defined($setting))`

`‎src/test/recovery/t/009_twophase.pl`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`subconfigure_and_reload`
`13`	`13`	`{`
	`14`	`+local$Test::Builder::Level =$Test::Builder::Level + 1;`
	`15`	`+`
`14`	`16`	`my ($node,$parameter) =@_;`
`15`	`17`	`my$name =$node->name;`
`16`	`18`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp