From f3d8e53b2ff8e24aaa43193ec726fccc81015b70 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Fri, 29 Jun 2018 17:36:40 -0400 Subject: tests/include-binary-package-transfer.sh: Include a new foo-1 ver after foo-1 and foo-2 --- diff --git a/tests/include-binary-package-transfer.sh b/tests/include-binary-package-transfer.sh index 77cdeb0..5b687a6 100755 --- a/tests/include-binary-package-transfer.sh +++ b/tests/include-binary-package-transfer.sh @@ -22,19 +22,21 @@ . tap-functions.sh . opk.sh -plan_ 13 +plan_ 25 mkdir 'archive/' cat >'archive/conf' <<-EOF conf_pool_gc_delay=0 EOF +# Include foo-1 1.0-1. changes="$(make_opks_and_changes 'foo-1' 'foo-1 bar' '1.0-1' 'arch' 'plat' \ 'trunk' 'base')" command_ok_ 'pro-archman include' -- "${PRO_ARCHMAN}" -v -b 'archive/' include \ "${changes}" +# Include foo-2 2.0-1. changes="$(make_opks_and_changes 'foo-2' 'foo-2 bar' '2.0-1' 'arch' 'plat' \ 'trunk' 'base')" @@ -119,4 +121,90 @@ command_ok_ 'package "bar" SHA256sum OK' -- \ = "x$(sed -n 's/^SHA256sum: //p;' "${got_packages}" | \ sed -n '1{ p; q; }')" ] +# Now include foo-1 1.0-2. +changes="$(make_opks_and_changes 'foo-1' 'foo-1 bar' '1.0-2' 'arch' 'plat' \ + 'trunk' 'base')" + +command_ok_ 'pro-archman include' -- "${PRO_ARCHMAN}" -v -b 'archive/' include \ + "${changes}" + +command_ok_ 'package "foo-1" provided by "src:foo-1" in pool' -- \ + [ -f 'archive/pool/f/foo-1/foo-1_1.0-2_arch_plat.opk' ] +command_ok_ 'package "bar" provided by "src:foo-1" not in pool' -D TODO -- \ + not [ -f 'archive/pool/f/foo-1/bar_1.0-2_arch_plat.opk' ] +command_ok_ 'package "foo-2" provided by "src:foo-2" still in pool' -- \ + [ -f 'archive/pool/f/foo-2/foo-2_2.0-1_arch_plat.opk' ] +command_ok_ 'package "bar" provided by "src:foo-2" still in pool' -- \ + [ -f 'archive/pool/f/foo-2/bar_2.0-1_arch_plat.opk' ] + +got_packages='archive/feeds/dev/trunk/arch/plat/base/Packages' +cat >'Packages.exp' <<-EOF + Package: bar + Source: foo-2 + Version: 2.0-1 + Architecture: arch + Platform: plat + Maintainer: "J. Random Hacker" + Filename: ../../../../../../pool/f/foo-2/bar_2.0-1_arch_plat.opk + $(grep '^Size: ' "${got_packages}" | sed -n '1{ p; q; }') + $(grep '^MD5sum: ' "${got_packages}" | sed -n '1{ p; q; }') + $(grep '^SHA256sum: ' "${got_packages}" | sed -n '1{ p; q; }') + + Package: foo-1 + Source: foo-1 + Version: 1.0-2 + Architecture: arch + Platform: plat + Maintainer: "J. Random Hacker" + Filename: ../../../../../../pool/f/foo-1/foo-1_1.0-2_arch_plat.opk + $(grep '^Size: ' "${got_packages}" | sed -n '2{ p; q; }') + $(grep '^MD5sum: ' "${got_packages}" | sed -n '2{ p; q; }') + $(grep '^SHA256sum: ' "${got_packages}" | sed -n '2{ p; q; }') + + Package: foo-2 + Source: foo-2 + Version: 2.0-1 + Architecture: arch + Platform: plat + Maintainer: "J. Random Hacker" + Filename: ../../../../../../pool/f/foo-2/foo-2_2.0-1_arch_plat.opk + $(grep '^Size: ' "${got_packages}" | sed -n '3{ p; q; }') + $(grep '^MD5sum: ' "${got_packages}" | sed -n '3{ p; q; }') + $(grep '^SHA256sum: ' "${got_packages}" | sed -n '3{ p; q; }') + + EOF +command_ok_ 'packages index OK' -D TODO -- \ + diff -u 'Packages.exp' "${got_packages}" + +command_ok_ 'package "foo-1" MD5sum OK' -- \ + [ "x$(md5sum 'archive/pool/f/foo-1/foo-1_1.0-2_arch_plat.opk' | \ + sed 's/ .*$//')" \ + = "x$(sed -n 's/^MD5sum: //p;' "${got_packages}" | \ + sed -n '2{ p; q; }')" ] +command_ok_ 'package "foo-1" SHA256sum OK' -- \ + [ "x$(sha256sum 'archive/pool/f/foo-1/foo-1_1.0-2_arch_plat.opk' | \ + sed 's/ .*$//')" \ + = "x$(sed -n 's/^SHA256sum: //p;' "${got_packages}" | \ + sed -n '2{ p; q; }')" ] +command_ok_ 'package "foo-2" MD5sum OK' -- \ + [ "x$(md5sum 'archive/pool/f/foo-2/foo-2_2.0-1_arch_plat.opk' | \ + sed 's/ .*$//')" \ + = "x$(sed -n 's/^MD5sum: //p;' "${got_packages}" | \ + sed -n '3{ p; q; }')" ] +command_ok_ 'package "foo-2" SHA256sum OK' -- \ + [ "x$(sha256sum 'archive/pool/f/foo-2/foo-2_2.0-1_arch_plat.opk' | \ + sed 's/ .*$//')" \ + = "x$(sed -n 's/^SHA256sum: //p;' "${got_packages}" | \ + sed -n '3{ p; q; }')" ] +command_ok_ 'package "bar" MD5sum OK' -D TODO -- \ + [ "x$(md5sum 'archive/pool/f/foo-2/bar_2.0-1_arch_plat.opk' | \ + sed 's/ .*$//')" \ + = "x$(sed -n 's/^MD5sum: //p;' "${got_packages}" | \ + sed -n '1{ p; q; }')" ] +command_ok_ 'package "bar" SHA256sum OK' -D TODO -- \ + [ "x$(sha256sum 'archive/pool/f/foo-2/bar_2.0-1_arch_plat.opk' | \ + sed 's/ .*$//')" \ + = "x$(sed -n 's/^SHA256sum: //p;' "${got_packages}" | \ + sed -n '1{ p; q; }')" ] + : -- cgit v0.9.1