Fix incorrect TAP test ordering

petere · petere · commit 92155e15d3cf · 2023-05-15T07:11:22.000+02:00
Using a test function before a possible skip_all is incorrect. If the skip_all is called, the test output will become incorrect and the test file will fail. a4f23f9 introduced a new test before skip_all. After discussion, this doesn't really need to be a test. Instead, we just bail out if the condition is not satisfied. Discussion: https://www.postgresql.org/message-id/af5567a1-aea6-fbdb-7e4b-d1e23a43c43b@enterprisedb.com
diff --git a/src/bin/pg_amcheck/t/004_verify_heapam.pl b/src/bin/pg_amcheck/t/004_verify_heapam.pl
@@ -340,7 +340,7 @@ sub write_tuple
 	    FROM heap_page_items(get_raw_page('test', 'main', 0))
     )
 );
-is(scalar @lp_off, $ROWCOUNT, "acquired row offsets");
+scalar @lp_off == $ROWCOUNT or BAIL_OUT("row offset counts mismatch");
 
 # Sanity check that our 'test' table on disk layout matches expectations.  If
 # this is not so, we will have to skip the test until somebody updates the test

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ sub write_tuple`
`340`	`340`	`FROM heap_page_items(get_raw_page('test', 'main', 0))`
`341`	`341`	`)`
`342`	`342`	`);`
`343`		`-is(scalar @lp_off, $ROWCOUNT, "acquired row offsets");`
	`343`	`+scalar @lp_off == $ROWCOUNT or BAIL_OUT("row offset counts mismatch");`
`344`	`344`
`345`	`345`	`# Sanity check that our 'test' table on disk layout matches expectations. If`
`346`	`346`	`# this is not so, we will have to skip the test until somebody updates the test`