From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Oct 2018 15:21:11 +0000 (+0100)
Subject: test suite: push-source-with-changes: Make it test -wdda
X-Git-Tag: archive/debian/8.0~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=baa9de40ad22d98b51959054a50e46b2456d33d5;p=dgit.git

test suite: push-source-with-changes: Make it test -wdda

We have plenty of other places where we used -wddn or ,no-check.

Here we have an opportunity to test -wdda: create a ~ file (which
would be ignored), clean everything else, and check that -wdda fails
but the default (-wdd) succeds.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/push-source-with-changes b/tests/tests/push-source-with-changes
index 2a123c33..aed1b63c 100755
--- a/tests/tests/push-source-with-changes
+++ b/tests/tests/push-source-with-changes
@@ -23,7 +23,14 @@ t-dgit -C ../${p}_1.0_multi.changes push-source --new
 t-expect-fail F:'tree contains uncommitted files' \
 t-dgit build-source
 
-t-dgit -wddn build-source
+cp debian/rules{,~}
+git clean -df
+ls debian/rules~
+
+t-expect-fail F:'tree contains uncommitted files' \
+t-dgit -wdda build-source
+
+t-dgit build-source
 t-dgit -C ../${p}_1.0_source.changes push-source --new
 
 t-pushed-good master