quilt fixup: Check we can delete files with funny modes

[dgit.git] / tests / tests / unrepresentable

diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable
index 9dd2111baac87ff3db7f25c4649866f3e901d63c..b2de45289396b2108ff978d5cf8898ef231266f4 100755 (executable)
--- a/tests/tests/unrepresentable
+++ b/tests/tests/unrepresentable
@@ -4,13 +4,13 @@ set -e
 
 t-tstunt-parsechangelog
 
-t-prep-newpackage example 1.0
+t-prep-newpackage example 1.1
 
 ln -s $troot/pkg-srcs/${p}_${v%-*}.orig.tar.* .
 
 cd $p
 
-start () { git checkout quilt-tip~0; }
+start () { git checkout quilt-tip-1.1~0; }
 attempt () { t-dgit -wgf --quilt=smash quilt-fixup; }
 
 badly-1 () {
@@ -21,13 +21,17 @@ badly-1 () {
 
 badly-2 () {
        git commit -m "Commit wrongness $wrongfn ($wrongmsg)"
-       t-expect-fail "cannot represent change: $wrongmsg: $wrongfn" \
+       t-expect-fail E:"cannot represent change: $wrongmsg .*: $wrongfn" \
        attempt
 }
 
-badly-1 symlink 'not a plain file'
-       ln -s TARGET symlink
-       git add symlink
+badly-1 orig-symlink 'modified symlink'
+       ln -sf NEWTARGET orig-symlink
+       git add orig-symlink
+badly-2
+
+badly-1 orig-symlink 'deletion of symlink'
+       git rm -f orig-symlink
 badly-2
 
 start
@@ -35,12 +39,18 @@ start
        git commit -m deleted
 attempt
 
-badly-1 src.c 'mode changed'
+start
+       git rm orig-exec
+       git rm -f orig-unwriteable
+       git commit -m 'deleted funny'
+attempt
+
+badly-1 src.c 'mode or type changed'
        chmod +x src.c
        git add src.c
 badly-2
 
-badly-1 new 'non-default mode'
+badly-1 new 'creation with non-default mode'
        echo hi >new
        chmod 755 new
        git add new
@@ -49,4 +59,4 @@ badly-2
 start
 attempt
 
-echo ok.
+t-ok