summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2017-10-20 23:37:36 +0200
committerJulian Andres Klode <jak@debian.org>2017-10-20 23:40:53 +0200
commit404dececf913d3c09368a73ca00aa8172dbf6865 (patch)
treef8205f43d8a5f95885c685be6ec4616c351bc7d3 /test/integration
parentf7281c4dbfe77f1d2a4da2f9e309104b0c86c45f (diff)
Fix testsuite for and add new fields from dpkg 1.19
tagfile-order.c: Add missing fields from dpkg 1.19 For binary packages, this is Build-Essential; for source packages, it is Description. test-bug-718329-...: Ignore control.tar.*, changes in dpkg 1.19 test-apt-extracttemplates: Fix for dpkg 1.19
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-apt-extracttemplates1
-rwxr-xr-xtest/integration/test-bug-718329-support-data.tar-uncompressed7
2 files changed, 6 insertions, 2 deletions
diff --git a/test/integration/test-apt-extracttemplates b/test/integration/test-apt-extracttemplates
index b299d85f4..9b07ef79f 100755
--- a/test/integration/test-apt-extracttemplates
+++ b/test/integration/test-apt-extracttemplates
@@ -16,6 +16,7 @@ CONFIG_STR="#!/bin/sh
random shell stuff
"
echo "$CONFIG_STR" > DEBIAN/config
+chmod 755 DEBIAN/config
testrun() {
local TEMPLATE_STR='Template: foo/bar
diff --git a/test/integration/test-bug-718329-support-data.tar-uncompressed b/test/integration/test-bug-718329-support-data.tar-uncompressed
index b1aa419a7..931802530 100755
--- a/test/integration/test-bug-718329-support-data.tar-uncompressed
+++ b/test/integration/test-bug-718329-support-data.tar-uncompressed
@@ -1,6 +1,10 @@
#!/bin/sh
set -e
+art() {
+ ar t "$@" | grep -v control.tar
+}
+
test_process_package_with_compression() {
COMPRESSOR="$1"
DATA_TAR="$2"
@@ -9,8 +13,7 @@ test_process_package_with_compression() {
buildsimplenativepackage 'pkg' 'all' '1.0' '' '' 'some descr' '' '' '' "$COMPRESSOR"
testsuccessequal "debian-binary
-control.tar.gz
-$DATA_TAR" ar t incoming/pkg_1.0_all.deb
+$DATA_TAR" art incoming/pkg_1.0_all.deb
testequal "Package: pkg" echo "$(aptftparchive packages incoming/|grep ^Package)"