From daf72471f8b14969e182535b6cffa1ecdd12e3a1 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Thu, 14 Sep 2017 19:20:46 +0200 Subject: Unbreack dch tests with newer devscripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to #842468 debchange now produces shorter output omitting empty blocks if there weren't any changes by the maintainer invoking debchange (which is nice): diff --git a/../old b/../new index 7c61312b..3823def2 100644 --- a/../old +++ b/../new @@ -5,8 +5,6 @@ test-package (1.0-1~1.gbpa26a34) UNRELEASED; urgency=medium [ Guido Günther ] * added debian/control - [ gbp test user ] - -- gbp test user Thu, 14 Sep 2017 19:18:45 +0200 So check for the matching lines in both the old and new location. (cherry picked from commit 84596ab80278eaf388a5fbf206a13bd2faaccf1c) --- tests/11_test_dch_main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/11_test_dch_main.py b/tests/11_test_dch_main.py index 58571687..58b0eb94 100644 --- a/tests/11_test_dch_main.py +++ b/tests/11_test_dch_main.py @@ -394,7 +394,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_git_author(self): options = ["--git-author", '-S', '-a'] lines = self.run_dch(options) - self.assertIn("-- gbp test user ", lines[9]) + self.assertIn("-- gbp test user ", lines[7] + lines[9]) def test_dch_main_no_git_author(self): options = ["--no-git-author", '-S', '-a'] -- cgit v1.2.3