From 7414af7fa88164209eec9c585b8d175c1618ecbc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 12 Sep 2015 10:35:49 +0200 Subject: various changes to increase test-coverage And of course, testing obscure things ends up showing obscure 'bugs' or better shortcomings/inconsitencies, so lets fix them with the tests. Git-Dch: Ignore --- test/integration/test-apt-get-build-dep | 47 +++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 17 deletions(-) (limited to 'test/integration/test-apt-get-build-dep') diff --git a/test/integration/test-apt-get-build-dep b/test/integration/test-apt-get-build-dep index f7af5b782..6df49d782 100755 --- a/test/integration/test-apt-get-build-dep +++ b/test/integration/test-apt-get-build-dep @@ -5,12 +5,15 @@ TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment -configarchitecture "i386" +configarchitecture 'i386' -buildsimplenativepackage 'debhelper' 'i386' '7' 'stable' -buildsimplenativepackage 'build-essential' 'i386' '1' 'stable' +insertpackage 'stable' 'debhelper' 'i386' '7' +insertpackage 'stable' 'build-essential' 'i386' '1' +insertinstalledpackage 'build-conflict' 'i386' '1' setupaptarchive + +msgmsg 'Test with' 'unsigned dsc' cat > 2vcard_0.5-3.dsc < Uploaders: Marcela Tiznado Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5.0.37) +Build-Conflicts: build-conflict (<< 2) Checksums-Sha1: b7f1ce31ec856414a3f0f1090689f91aa7456d56 9398 2vcard_0.5.orig.tar.gz 5f9acd07ebda6ab00fa6b4fe3198c13e94090862 2036 2vcard_0.5-3.diff.gz @@ -32,17 +36,24 @@ Files: 1e806d32233af87437258d86b1561f57 2036 2vcard_0.5-3.diff.gz EOF -testsuccessequal "Reading package lists... +test2vcardbuilddep() { + testsuccessequal "Reading package lists... Building dependency tree... Note, using file '2vcard_0.5-3.dsc' to get the build dependencies +The following packages will be REMOVED: + build-conflict The following NEW packages will be installed: build-essential debhelper -0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +0 upgraded, 2 newly installed, 1 to remove and 0 not upgraded. +Remv build-conflict [1] Inst build-essential (1 stable [i386]) Inst debhelper (7 stable [i386]) Conf build-essential (1 stable [i386]) Conf debhelper (7 stable [i386])" aptget build-dep -s 2vcard_0.5-3.dsc +} +test2vcardbuilddep +msgmsg 'Test with' 'signed dsc' cat > 2vcard_0.5-3.dsc < Uploaders: Marcela Tiznado Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5.0.37) +Build-Conflicts: build-conflict (<< 2) Checksums-Sha1: b7f1ce31ec856414a3f0f1090689f91aa7456d56 9398 2vcard_0.5.orig.tar.gz 5f9acd07ebda6ab00fa6b4fe3198c13e94090862 2036 2vcard_0.5-3.diff.gz @@ -74,20 +86,10 @@ z2UAn1oXgTai6opwhVfkxrlmJ+iRxzuc =4eRd -----END PGP SIGNATURE----- EOF - -testsuccessequal "Reading package lists... -Building dependency tree... -Note, using file '2vcard_0.5-3.dsc' to get the build dependencies -The following NEW packages will be installed: - build-essential debhelper -0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. -Inst build-essential (1 stable [i386]) -Inst debhelper (7 stable [i386]) -Conf build-essential (1 stable [i386]) -Conf debhelper (7 stable [i386])" aptget build-dep --simulate 2vcard_0.5-3.dsc +test2vcardbuilddep -# unpacked source dir +msgmsg 'Test with' 'unpacked source dir' mkdir -p foo-1.0/debian cat > foo-1.0/debian/control <<'EOF' Source: apturl @@ -127,3 +129,14 @@ Inst build-essential (1 stable [i386]) Inst debhelper (7 stable [i386]) Conf build-essential (1 stable [i386]) Conf debhelper (7 stable [i386])" aptget build-dep --simulate ./foo-1.0 + + +testfailureequal 'Reading package lists... +Building dependency tree... +E: Must specify at least one package to check builddeps for' aptget build-dep +testfailureequal 'Reading package lists... +Building dependency tree... +E: No architecture information available for armel. See apt.conf(5) APT::Architectures for setup' aptget build-dep --simulate ./foo-1.0 -a armel +testfailureequal 'Reading package lists... +Building dependency tree... +E: Unable to find a source package for foo' aptget build-dep --simulate foo -- cgit v1.2.3