@matheusbsbs / matheus-bagliano / commits / 18f60f2d3d

t5303: use printf to generate delta bases

The exact byte count of the delta base file is important. The test-delta helper will feed it to patch_delta(), which will barf if it doesn't match the size byte given in the delta. Using "echo" may end up with unexpected line endings on some platforms (e.g,. "\r\n" instead of just "\n"). This actually wouldn't cause the test to fail (since we already expect test-delta to complain about these bogus deltas), but would mean that we're not exercising the code we think we are. Let's use printf instead (which we already trust to give us byte-perfect output when we generate the deltas). While we're here, let's tighten the 5-byte result size used in the "truncated copy parameters" test. This just needs to have enough room to attempt to parse the bogus copy command, meaning 2 is sufficient. Using 5 was arbitrary and just copied from the base size; since those no longer match, it's simply confusing. Let's use a more meaningful number. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Aug 30, 2018 at 15:13 UTC 18f60f2d3dba291e1ea8e2751c1fce70580de8a9

1 file changed +10 -10

t/t5303-pack-corruption-resilience.sh

+10 -10

@@ -327,15 +327,15 @@ test_expect_success \

327 'printf "\0\1\2XX" > too_big_literal &&

328 test_must_fail test-tool delta -p /dev/null too_big_literal /dev/null'

329

330 -# \5 - five bytes in base

330 +# \4 - four bytes in base

331 # \1 - one byte in result

332 # \221 - copy, one byte offset, one byte size

333 # \0 - copy from offset 0

334 # \2 - copy two bytes (one too many)

335 test_expect_success \

336 'apply delta with too many copied bytes' \

337 - 'printf "\5\1\221\0\2" > too_big_copy &&

338 - echo base >base &&

337 + 'printf "\4\1\221\0\2" > too_big_copy &&

338 + printf base >base &&

339 test_must_fail test-tool delta -p base too_big_copy /dev/null'

340

341 # \0 - empty base

@@ -356,8 +356,8 @@ test_expect_success \

356 'printf "\0\1\221\0\1" > truncated_base &&

357 test_must_fail test-tool delta -p /dev/null truncated_base /dev/null'

358

359 -# \5 - five bytes in base

360 -# \5 - five bytes in result

359 +# \4 - four bytes in base

360 +# \2 - two bytes in result

361 # \1 - one literal byte (X)

362 # \221 - copy, one byte offset, one byte size

363 # (offset/size missing)

@@ -366,8 +366,8 @@ test_expect_success \

366 # delta size check.

367 test_expect_success \

368 'apply delta with truncated copy parameters' \

369 - 'printf "\5\5\1X\221" > truncated_copy_delta &&

370 - echo base >base &&

369 + 'printf "\4\2\1X\221" > truncated_copy_delta &&

370 + printf base >base &&

371 test_must_fail test-tool delta -p base truncated_copy_delta /dev/null'

372

373 # \0 - empty base

@@ -379,7 +379,7 @@ test_expect_success \

379 'printf "\0\1\1X\1" > tail_garbage_literal &&

380 test_must_fail test-tool delta -p /dev/null tail_garbage_literal /dev/null'

381

382 -# \5 - five bytes in base

382 +# \4 - four bytes in base

383 # \1 - one byte in result

384 # \1 - one literal byte (X)

385 # \221 - copy, one byte offset, one byte size

@@ -387,8 +387,8 @@ test_expect_success \

387 # \1 - copy 1 byte

388 test_expect_success \

389 'apply delta with trailing garbage copy' \

390 - 'printf "\5\1\1X\221\0\1" > tail_garbage_copy &&

391 - echo base >base &&

390 + 'printf "\4\1\1X\221\0\1" > tail_garbage_copy &&

391 + printf base >base &&

392 test_must_fail test-tool delta -p /dev/null tail_garbage_copy /dev/null'

393

394 # \0 - empty base