Test operations on hidden patches

[stgit] / t / t1205-push-subdir.sh

diff --git a/t/t1205-push-subdir.sh b/t/t1205-push-subdir.sh
index 175d36d2888987b85505de8810183217e63b3ba2..945eb7446b3e3085397e581c80abe311bcfa556a 100755 (executable)
--- a/t/t1205-push-subdir.sh
+++ b/t/t1205-push-subdir.sh
@@ -47,7 +47,7 @@ test_expect_success 'Conflicting push from subdir' '
     [ "$(echo $(cat x.txt))" = "x0" ] &&
     [ "$(echo $(cat foo/y.txt))" = "y0" ] &&
     cd foo &&
     [ "$(echo $(cat x.txt))" = "x0" ] &&
     [ "$(echo $(cat foo/y.txt))" = "y0" ] &&
     cd foo &&

-    ! stg push p2 &&
+    conflict_old stg push p2 &&

     cd .. &&
     [ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
 '
     cd .. &&
     [ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
 '


@@ -62,7 +62,7 @@ test_expect_success 'Conflicting add/unknown file in subdir' '
     stg pop &&
     mkdir -p d &&
     echo bar > d/test &&
     stg pop &&
     mkdir -p d &&
     echo bar > d/test &&

-    ! stg push foo &&
+    command_error stg push foo &&

     [ $(stg top) != "foo" ]
 '
 
     [ $(stg top) != "foo" ]
 '