Bug#886211: debchange: new tests fail when vendor != Debian

[Steve Langasek]

Package: devscripts
Version: 2.17.12
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear maintainers,

devscripts 2.17.12 fails to build in Ubuntu because a new test enforces the
Debian vendor behavior, but does not ensure that Debian is actually set as
the vendor:

testGuessedDistribution
ASSERT:expected:<unstable> but was:<bionic>
[...]
ASSERT:expected:<experimental> but was:<bionic>
[...]
ASSERT:expected:<jessie-backports> but was:<bionic>
ASSERT:expected:<jessie> but was:<bionic>
[...]

(https://launchpad.net/ubuntu/+source/devscripts/2.17.12/+build/14199899)

I have uploaded the attached patch to Ubuntu to fix this build failure. 
Please consider including it in Debian as well.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru devscripts-2.17.12/test/test_debchange devscripts-2.17.12ubuntu1/test/test_debchange
--- devscripts-2.17.12/test/test_debchange	2017-11-11 15:13:54.000000000 -0800
+++ devscripts-2.17.12ubuntu1/test/test_debchange	2018-01-02 21:03:46.000000000 -0800
@@ -205,9 +205,10 @@
     # $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"
 }