Test operations on hidden patches

[stgit] / t / t1600-delete-one.sh

diff --git a/t/t1600-delete-one.sh b/t/t1600-delete-one.sh
index 3052b3a9426b994ec236a4a912083c0214ed175b..b526a552c69977898e3241066814c0493231bae7 100755 (executable)
--- a/t/t1600-delete-one.sh
+++ b/t/t1600-delete-one.sh
@@ -20,7 +20,7 @@ test_expect_success \
     'Try to delete a non-existing patch' \
     '
     [ $(stg applied | wc -l) -eq 1 ] &&
     'Try to delete a non-existing patch' \
     '
     [ $(stg applied | wc -l) -eq 1 ] &&

-    ! stg delete bar &&
+    command_error stg delete bar &&

     [ $(stg applied | wc -l) -eq 1 ]
     '
 
     [ $(stg applied | wc -l) -eq 1 ]
     '
 


@@ -29,7 +29,7 @@ test_expect_success \
     '
     echo dirty >> foo.txt &&
     [ $(stg applied | wc -l) -eq 1 ] &&
     '
     echo dirty >> foo.txt &&
     [ $(stg applied | wc -l) -eq 1 ] &&

-    ! stg delete foo &&
+    command_error stg delete foo &&

     [ $(stg applied | wc -l) -eq 1 ] &&
     git reset --hard
     '
     [ $(stg applied | wc -l) -eq 1 ] &&
     git reset --hard
     '


@@ -77,8 +77,8 @@ test_expect_success \
     'Try to delete a non-topmost applied patch' \
     '
     [ $(stg applied | wc -l) -eq 2 ] &&
     'Try to delete a non-topmost applied patch' \
     '
     [ $(stg applied | wc -l) -eq 2 ] &&

-    ! stg delete foo &&
-    [ $(stg applied | wc -l) -eq 2 ]
+    stg delete foo &&
+    [ $(stg applied | wc -l) -eq 1 ]

     '
 
 test_expect_success \
     '
 
 test_expect_success \


@@ -99,10 +99,10 @@ test_expect_success \
 test_expect_success \
     'Delete a patch in another branch' \
     '
 test_expect_success \
     'Delete a patch in another branch' \
     '

-    [ $(stg applied | wc -l) -eq 3 ] &&
+    [ $(stg applied | wc -l) -eq 2 ] &&

     [ $(stg applied -b br | wc -l) -eq 1 ] &&
     stg delete -b br baz &&
     [ $(stg applied -b br | wc -l) -eq 1 ] &&
     stg delete -b br baz &&

-    [ $(stg applied | wc -l) -eq 3 ] &&
+    [ $(stg applied | wc -l) -eq 2 ] &&

     [ $(stg applied -b br | wc -l) -eq 0 ]
     '
 
     [ $(stg applied -b br | wc -l) -eq 0 ]
     '