[devscripts] 01/01: tests: Fix test_debchange when run on Debian derivatives

Mattia Rizzolo mattia at debian.org
Wed Jan 3 13:35:35 UTC 2018


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

mattia pushed a commit to branch master
in repository devscripts.

commit c361b2eab03e95ff7ac8a7149238c39518c4e795
Author: Steve Langasek <steve.langasek at canonical.com>
Date:   Wed Jan 3 14:34:49 2018 +0100

    tests: Fix test_debchange when run on Debian derivatives
    
    Closes: #886211
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/changelog    | 6 +++++-
 test/test_debchange | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 958cef3..b8ac90f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,11 @@ devscripts (2.18.1) UNRELEASED; urgency=medium
   * ltnu:
     + Add pkg-gnustep shortcut.  Closes: #885917
 
- -- Mattia Rizzolo <mattia at debian.org>  Sun, 31 Dec 2017 13:38:05 +0100
+  [ Steve Langasek ]
+  * tests:
+    + Fix test_debchange when run on Debian derivatives.  Closes: #886211
+
+ -- Mattia Rizzolo <mattia at debian.org>  Wed, 03 Jan 2018 14:31:54 +0100
 
 devscripts (2.17.12) unstable; urgency=medium
 
diff --git a/test/test_debchange b/test/test_debchange
index 7dd5248..01dd5dd 100755
--- a/test/test_debchange
+++ b/test/test_debchange
@@ -205,9 +205,10 @@ verifyGuessedDistribution() {
     # $2 → action
     # $3 → expected suite after the action
     rm -f "$CHANGELOG"
-    success "--create -D $1 --package test-package -v 1.0-1 'First upload'"
-    success "$2 'Second Upload'"
-    success "-r ''"
+    vdeb="--vendor Debian"
+    success "$vdeb --create -D $1 --package test-package -v 1.0-1 'First upload'"
+    success "$vdeb $2 'Second Upload'"
+    success "$vdeb -r ''"
     local dist="$(dpkg-parsechangelog -l"$CHANGELOG" -SDistribution)"
     assertEquals "$3" "$dist"
 }

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



More information about the devscripts-devel mailing list