Feedback-ID: ic6394509:Fastmail
MIME-Version: 1.0
Date: Mon, 28 Oct 2024 16:44:48 +0100
From: "Joel Jacobson" <joel@compiler.org>
To: "daniel@yesql.se" <daniel@yesql.se>
Cc: pgsql-hackers@lists.postgresql.org
Message-Id: <5fed8e00-e353-49e3-b962-220df7321bbc@app.fastmail.com>
In-Reply-To: <3D0A223A-2D28-42B8-877F-337589C2A627@yesql.se>
References: <49f7e64a-b9be-4a90-a9fe-210a7740405e@app.fastmail.com>
 <3D0A223A-2D28-42B8-877F-337589C2A627@yesql.se>
Subject: Re: Inconsistent output handling in 002_pg_upgrade.pl test logs
Content-Type: multipart/mixed;
 boundary=4f457791ed3b453ea1eaf24a9a71bba6
Archived-At: 
 <https://www.postgresql.org/message-id/5fed8e00-e353-49e3-b962-220df7321bbc%40app.fastmail.com>
Precedence: bulk

--4f457791ed3b453ea1eaf24a9a71bba6
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Mon, Oct 28, 2024, at 13:44, Daniel Gustafsson wrote:
>> On 28 Oct 2024, at 13:38, Joel Jacobson <joel@compiler.org> wrote:
>> 
>> Hi hackers,
>> 
>> I've noticed some inconsistency in 002_pg_upgrade.pl in how it handles output
>> during test failures. Currently, it uses note to print the header:
>> 
>>    note "=== contents of $log ===\n";
>> 
>> but print for the log content and footer:
>> 
>>    print slurp_file($log);
>>    print "=== EOF ===\n";
>
> Ugh, nice catch.
>
>> Option 1: Keep output together using note
>
>> Option 2: Adjust header message for separate logs
>
>> Thoughts on these options?
>
> I would prefer to output this to the log only and not the TAP output, to avoid
> the risk of not seeing the test output for all the log output on the screen.

I also think that's best, and in line with what we do in other parts of the same script.

Patch attached.

/Joel
--4f457791ed3b453ea1eaf24a9a71bba6
Content-Disposition: attachment;
	filename*0="0001-Fix-inconsistent-output-handling-in-002_pg_upgrade.p.pat";
	filename*1="ch"
Content-Type: application/octet-stream;
	name="=?UTF-8?Q?0001-Fix-inconsistent-output-handling-in-002=5Fpg=5Fupgrade.p.?=
 =?UTF-8?Q?patch?="
Content-Transfer-Encoding: base64

RnJvbSA0NWY0NGUzMmU3YmE0NjkyM2M0ZGYxNjdhNDQ4YmEyMGZjY2VjZTI2IE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKb2VsIEphY29ic29uIDxqb2VsQGNvbXBpbGVyLm9y
Zz4KRGF0ZTogTW9uLCAyOCBPY3QgMjAyNCAxNjozODoyMSArMDEwMApTdWJqZWN0OiBbUEFU
Q0hdIEZpeCBpbmNvbnNpc3RlbnQgb3V0cHV0IGhhbmRsaW5nIGluIDAwMl9wZ191cGdyYWRl
LnBsIHRlc3QKIGxvZ3MuCgpFbnN1cmUgdGhhdCBib3RoIGxvZyBoZWFkZXJzIGFuZCBjb250
ZW50cyBhcmUgYXBwZW5kZWQgdG8gdGhlIGRlZGljYXRlZCB0ZXN0CmxvZ2ZpbGUgaW5zdGVh
ZCBvZiBzcGxpdHRpbmcgYmV0d2VlbiBUQVAgb3V0cHV0IGFuZCB0aGUgbG9nZmlsZS4KCldo
ZW4gcGdfdXBncmFkZSBsb2dzIGFyZSBmb3VuZCwgbm90aWZ5IHRoZSB1c2VyIG9mIHRoZSBs
b2dmaWxlIGxvY2F0aW9uLgotLS0KIHNyYy9iaW4vcGdfdXBncmFkZS90LzAwMl9wZ191cGdy
YWRlLnBsIHwgNyArKysrKystCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAx
IGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2Jpbi9wZ191cGdyYWRlL3QvMDAyX3Bn
X3VwZ3JhZGUucGwgYi9zcmMvYmluL3BnX3VwZ3JhZGUvdC8wMDJfcGdfdXBncmFkZS5wbApp
bmRleCAxN2FmMmNlNjFlLi43OGJkNzc2ZjViIDEwMDY0NAotLS0gYS9zcmMvYmluL3BnX3Vw
Z3JhZGUvdC8wMDJfcGdfdXBncmFkZS5wbAorKysgYi9zcmMvYmluL3BnX3VwZ3JhZGUvdC8w
MDJfcGdfdXBncmFkZS5wbApAQCAtNDc1LDkgKzQ3NSwxNCBAQCBpZiAoLWQgJGxvZ19wYXRo
KQogCQkJICBpZiAkRmlsZTo6RmluZDo6bmFtZSA9fiBtLy4qXC5sb2cvOwogCQl9LAogCQkk
bmV3bm9kZS0+ZGF0YV9kaXIgLiAiL3BnX3VwZ3JhZGVfb3V0cHV0LmQiKTsKKworCW15ICR0
ZXN0X2xvZ2ZpbGUgPSAkUG9zdGdyZVNRTDo6VGVzdDo6VXRpbHM6OnRlc3RfbG9nZmlsZTsK
KworCW5vdGUgIj09PSBwZ191cGdyYWRlIGxvZ3MgZm91bmQgLSBhcHBlbmRpbmcgdG8gJHRl
c3RfbG9nZmlsZSA9PT1cbiI7CiAJZm9yZWFjaCBteSAkbG9nIChAbG9nX2ZpbGVzKQogCXsK
LQkJbm90ZSAiPT09IGNvbnRlbnRzIG9mICRsb2cgPT09XG4iOworCQlub3RlICI9PT0gYXBw
ZW5kaW5nICRsb2cgPT09XG4iOworCQlwcmludCAiPT09IGNvbnRlbnRzIG9mICRsb2cgPT09
XG4iOwogCQlwcmludCBzbHVycF9maWxlKCRsb2cpOwogCQlwcmludCAiPT09IEVPRiA9PT1c
biI7CiAJfQotLSAKMi40NS4xCgo=

--4f457791ed3b453ea1eaf24a9a71bba6--