dgit: import-dsc: Handle relative symlinks correctly

[dgit.git] / tests / tests / push-source-with-changes

diff --git a/tests/tests/push-source-with-changes b/tests/tests/push-source-with-changes
index b9a3906cbf2a81575c12225353c51dd69e445533..aed1b63cbb715d8e32ec09e7a529411419a6cff5 100755 (executable)
--- a/tests/tests/push-source-with-changes
+++ b/tests/tests/push-source-with-changes
@@ -2,8 +2,6 @@
 set -e
 . tests/lib
 
-arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
-
 t-tstunt-parsechangelog
 
 t-prep-newpackage example 1.0
@@ -15,14 +13,24 @@ t-ref-head
 
 # (1) try pushing a changes file containing binaries
 
-t-dgit --dpkg-buildpackage:-d build -F
+t-dgit build -F
 
 t-expect-push-fail 'user-specified changes file is not source-only' \
-t-dgit -C ../${p}_1.0_${arch}.changes push-source --new
+t-dgit -C ../${p}_1.0_multi.changes push-source --new
 
 # (2) try pushing a source-only changes file
 
-t-dgit --dpkg-buildpackage:-d build-source
+t-expect-fail F:'tree contains uncommitted files' \
+t-dgit 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