test suite: Check that archive skew machinery reports warning

[dgit.git] / tests / tests / gdr-diverge-nmu-dgit

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index 4b5907a1caafc13b49a0e676ce0037da651e5bb2..007c35b81d68a40dc071896d98bef400d4a9d3d5 100755 (executable)
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -28,7 +28,7 @@ t-git-next-date
 v=2.0-2+nmu1
 t-nmu-commit-an-upstream-change
 t-dch-commit -v$v -m finalise
-t-dch-commit -r sid
+t-dch-commit-r
 
 t-dgit -wgf push-source
 
@@ -42,7 +42,7 @@ t-nmu-causes-ff-fail
 
 git checkout dgit/dgit/sid # detach
 
-t-expect-fail 'E:CONFLICT.*Commit Debian 3\.0 \(quilt\) metadata' \
+t-expect-fail 'E:CONFLICT.*Commit patch queue' \
 git rebase master
 git rebase --skip