Skip to content

Commit 1757333

Browse files
larsxschneidergitster
authored andcommitted
t0021: write "OUT <size>" only on success
"rot13-filter.pl" always writes "OUT <size>" to the debug log at the end of a response. This works perfectly for the existing responses "abort", "error", and "success". A new response "delayed", that will be introduced in a subsequent patch, accepts the input without giving the filtered result right away. At this point we cannot know the size of the response. Therefore, we do not write "OUT <size>" for "delayed" responses. To simplify the code we do not write "OUT <size>" for "abort" and "error" responses either as their size is always zero. Signed-off-by: Lars Schneider <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e1ec472 commit 1757333

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

t/t0021-conversion.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ test_expect_success PERL 'process filter should restart after unexpected write f
588588
cat >expected.log <<-EOF &&
589589
START
590590
init handshake complete
591-
IN: smudge smudge-write-fail.r $SF [OK] -- OUT: $SF [WRITE FAIL]
591+
IN: smudge smudge-write-fail.r $SF [OK] -- [WRITE FAIL]
592592
START
593593
init handshake complete
594594
IN: smudge test.r $S [OK] -- OUT: $S . [OK]
@@ -634,7 +634,7 @@ test_expect_success PERL 'process filter should not be restarted if it signals a
634634
cat >expected.log <<-EOF &&
635635
START
636636
init handshake complete
637-
IN: smudge error.r $SE [OK] -- OUT: 0 [ERROR]
637+
IN: smudge error.r $SE [OK] -- [ERROR]
638638
IN: smudge test.r $S [OK] -- OUT: $S . [OK]
639639
IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK]
640640
STOP
@@ -673,7 +673,7 @@ test_expect_success PERL 'process filter abort stops processing of all further f
673673
cat >expected.log <<-EOF &&
674674
START
675675
init handshake complete
676-
IN: smudge abort.r $SA [OK] -- OUT: 0 [ABORT]
676+
IN: smudge abort.r $SA [OK] -- [ABORT]
677677
STOP
678678
EOF
679679
test_cmp_exclude_clean expected.log debug.log &&

t/t0021/rot13-filter.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@ sub packet_flush {
153153
die "bad command '$command'";
154154
}
155155

156-
print $debug "OUT: " . length($output) . " ";
157-
$debug->flush();
158-
159156
if ( $pathname eq "error.r" ) {
160157
print $debug "[ERROR]\n";
161158
$debug->flush();
@@ -178,6 +175,9 @@ sub packet_flush {
178175
die "${command} write error";
179176
}
180177

178+
print $debug "OUT: " . length($output) . " ";
179+
$debug->flush();
180+
181181
while ( length($output) > 0 ) {
182182
my $packet = substr( $output, 0, $MAX_PACKET_CONTENT_SIZE );
183183
packet_bin_write($packet);

0 commit comments

Comments
 (0)