diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-09-14 19:20:46 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-10-20 12:29:17 +0200 |
| commit | daf72471f8b14969e182535b6cffa1ecdd12e3a1 (patch) | |
| tree | 58ee6948f197b19586222643e401f03292169d9b | |
| parent | 4f5ee19158e2058537fbb8023beb8803f5b46d60 (diff) | |
Unbreack dch tests with newer devscripts
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 <gbp@example.com> 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)
| -rw-r--r-- | tests/11_test_dch_main.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 <gbp@example.com>", lines[9]) + self.assertIn("-- gbp test user <gbp@example.com>", lines[7] + lines[9]) def test_dch_main_no_git_author(self): options = ["--no-git-author", '-S', '-a'] |