diff options
author | Michael Paquier | 2019-02-18 05:23:30 +0000 |
---|---|---|
committer | Michael Paquier | 2019-02-18 05:23:30 +0000 |
commit | a916bdc496a9d3fde48ca7c72478e7e4aecc5597 (patch) | |
tree | a57451b11ccb3dd3914b386037120ca088487819 | |
parent | f0cce9fcb5fd9f4158dbf5dfe11f263ad3b7b1dd (diff) |
Fix some issues with TAP tests of pg_basebackup and pg_verify_checksums
ee9e145 has fixed the tests of pg_basebackup for checksums a first time,
still one seek() call missed the shot. Also, the data written in files
to emulate corruptions was not actually writing zeros as the quoting
style was incorrect.
Backpatch the portion for pg_basebackup to v11 where these tests have
been introduced. The tests of pg_verify_checksums are new as of v12.
Author: Michael Banck
Discussion: https://postgr.es/m/[email protected]
Backpatch-through: 11
-rw-r--r-- | src/bin/pg_basebackup/t/010_pg_basebackup.pl | 8 | ||||
-rw-r--r-- | src/bin/pg_verify_checksums/t/002_actions.pl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index 3e1c3863c4..33869fecc9 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -499,7 +499,7 @@ my $block_size = $node->safe_psql('postgres', 'SHOW block_size;'); system_or_bail 'pg_ctl', '-D', $pgdata, 'stop'; open $file, '+<', "$pgdata/$file_corrupt1"; seek($file, $pageheader_size, 0); -syswrite($file, '\0\0\0\0\0\0\0\0\0'); +syswrite($file, "\0\0\0\0\0\0\0\0\0"); close $file; system_or_bail 'pg_ctl', '-D', $pgdata, 'start'; @@ -518,7 +518,7 @@ for my $i (1 .. 5) { my $offset = $pageheader_size + $i * $block_size; seek($file, $offset, 0); - syswrite($file, '\0\0\0\0\0\0\0\0\0'); + syswrite($file, "\0\0\0\0\0\0\0\0\0"); } close $file; system_or_bail 'pg_ctl', '-D', $pgdata, 'start'; @@ -534,8 +534,8 @@ rmtree("$tempdir/backup_corrupt2"); # induce corruption in a second file system_or_bail 'pg_ctl', '-D', $pgdata, 'stop'; open $file, '+<', "$pgdata/$file_corrupt2"; -seek($file, 4000, 0); -syswrite($file, '\0\0\0\0\0\0\0\0\0'); +seek($file, $pageheader_size, 0); +syswrite($file, "\0\0\0\0\0\0\0\0\0"); close $file; system_or_bail 'pg_ctl', '-D', $pgdata, 'start'; diff --git a/src/bin/pg_verify_checksums/t/002_actions.pl b/src/bin/pg_verify_checksums/t/002_actions.pl index 5250b5a728..74ad5ad723 100644 --- a/src/bin/pg_verify_checksums/t/002_actions.pl +++ b/src/bin/pg_verify_checksums/t/002_actions.pl @@ -45,7 +45,7 @@ sub check_relation_corruption # Time to create some corruption open my $file, '+<', "$pgdata/$file_corrupted"; seek($file, $pageheader_size, 0); - syswrite($file, '\0\0\0\0\0\0\0\0\0'); + syswrite($file, "\0\0\0\0\0\0\0\0\0"); close $file; # Checksum checks on single relfilenode fail |