[pbuilder] 02/02: t: fix the pbuilder-apt-config test

Mattia Rizzolo mattia at debian.org
Thu Nov 10 16:58:19 UTC 2016


This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository pbuilder.

commit b8bd5ba54f1c1431939522f968ba2c00ab8cea1a
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Nov 10 16:48:16 2016 +0000

    t: fix the pbuilder-apt-config test
    
    Gbp-Dch: Ignore
---
 t/test_pbuilder-apt-config | 48 ++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/t/test_pbuilder-apt-config b/t/test_pbuilder-apt-config
index e396aa5..daaa506 100755
--- a/t/test_pbuilder-apt-config
+++ b/t/test_pbuilder-apt-config
@@ -4,6 +4,8 @@ set -e
 
 self="$(basename "$0")"
 
+recent_enough_ubuntu=xenial
+
 TD="$(dirname "$0")"
 if [ -n "$PBUILDER_CHECKOUT" ]; then
     . "$TD/testlib.sh"
@@ -92,8 +94,8 @@ expect_output "deb archive-mirror hamm component" run_suite_mode --mirror "" --a
 expect_fail run_suite_mode --mirror "" --archive nomirror
 expect_output "deb http://archive.debian.org/debian/ bo component" run_suite_mode --mirror "" --suite bo
 
-expect_output "deb ubuntu-mirror lucid component" run_suite_mode --mirror "" --suite lucid --arch i386
-expect_output "deb ubuntu-ports-mirror lucid component" run_suite_mode --mirror "" --suite lucid --arch armel
+expect_output "deb ubuntu-mirror ${recent_enough_ubuntu} component" run_suite_mode --mirror "" --suite ${recent_enough_ubuntu} --arch i386
+expect_output "deb ubuntu-ports-mirror ${recent_enough_ubuntu} component" run_suite_mode --mirror "" --suite ${recent_enough_ubuntu} --arch armel
 
 expect_output "deb mirror hamm comp1
 deb mirror hamm comp1 comp2 comp3
@@ -134,24 +136,24 @@ deb squeeze/volatile comp1
 deb squeeze-proposed-updates/volatile comp1" test_profile squeeze-proposed-updates/volatile
 expect_output "deb bo comp1" test_profile bo
 
-expect_output "deb lucid comp1" test_profile lucid
-expect_output "deb lucid comp1
-deb lucid-security comp1
-deb lucid-security comp1" test_profile lucid-security
-expect_output "deb lucid comp1
-deb lucid-security comp1
-deb lucid-updates comp1
-deb lucid-security comp1" test_profile lucid-updates
-expect_output "deb lucid comp1
-deb lucid-security comp1
-deb lucid-updates comp1
-deb lucid-backports comp1
-deb lucid-security comp1" test_profile lucid-backports
-expect_output "deb lucid comp1
-deb lucid-security comp1
-deb lucid-updates comp1
-deb lucid-proposed comp1
-deb lucid-security comp1" test_profile lucid-proposed
+expect_output "deb ${recent_enough_ubuntu} comp1" test_profile ${recent_enough_ubuntu}
+expect_output "deb ${recent_enough_ubuntu} comp1
+deb ${recent_enough_ubuntu}-security comp1
+deb ${recent_enough_ubuntu}-security comp1" test_profile ${recent_enough_ubuntu}-security
+expect_output "deb ${recent_enough_ubuntu} comp1
+deb ${recent_enough_ubuntu}-security comp1
+deb ${recent_enough_ubuntu}-updates comp1
+deb ${recent_enough_ubuntu}-security comp1" test_profile ${recent_enough_ubuntu}-updates
+expect_output "deb ${recent_enough_ubuntu} comp1
+deb ${recent_enough_ubuntu}-security comp1
+deb ${recent_enough_ubuntu}-updates comp1
+deb ${recent_enough_ubuntu}-backports comp1
+deb ${recent_enough_ubuntu}-security comp1" test_profile ${recent_enough_ubuntu}-backports
+expect_output "deb ${recent_enough_ubuntu} comp1
+deb ${recent_enough_ubuntu}-security comp1
+deb ${recent_enough_ubuntu}-updates comp1
+deb ${recent_enough_ubuntu}-proposed comp1
+deb ${recent_enough_ubuntu}-security comp1" test_profile ${recent_enough_ubuntu}-proposed
 
 expect_output "deb     mirror hamm component
 deb-src mirror hamm component" run_suite_mode --with-sources=yes
@@ -164,7 +166,7 @@ expect_output "deb mirror hamm component" run_suite_mode --with-sources=no
 expect_output "deb ubuntu-mirror hamm component" run_suite_mode --mirror "" --archive ubuntu
 expect_output "deb ubuntu-ports-mirror hamm component" run_suite_mode --arch armel --mirror "" --archive ubuntu-ports
 expect_fail run_hamm_mode --arch armel --mirror "" --archive otherarchive
-expect_success run_suite_mode --mirror "" --suite lucid
+expect_success run_suite_mode --mirror "" --suite ${recent_enough_ubuntu}
 expect_fail    run_suite_mode --mirror "" --suite suite
 expect_success run_suite_mode --mirror "" --suite suite --archive ubuntu
 expect_output "deb ppa-people-ppa suite component" run_suite_mode --mirror "" --suite suite --archive ppa:people
@@ -177,8 +179,8 @@ expect_output "mirror" debootstrap_mirror --suite sid --mirror mirror
 
 expect_output "sid" debootstrap_suite --profile sid
 expect_output "sid" debootstrap_suite --profile unstable
-expect_output "ubuntu-mirror" debootstrap_mirror --profile lucid --arch amd64
-expect_output "ubuntu-ports-mirror" debootstrap_mirror --profile lucid --arch armel
+expect_output "ubuntu-mirror" debootstrap_mirror --profile ${recent_enough_ubuntu} --arch amd64
+expect_output "ubuntu-ports-mirror" debootstrap_mirror --profile ${recent_enough_ubuntu} --arch armel
 
 rm -f "$mirror_map"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git



More information about the Pbuilder-maint mailing list