Test operations on hidden patches

[stgit] / t / t2500-clean.sh

diff --git a/t/t2500-clean.sh b/t/t2500-clean.sh
index b38d868cfef2beb2cbbd99142c5e30c45377ae46..abde9cf7aabe92b1f9eccf9e3cbe265208d59470 100755 (executable)
--- a/t/t2500-clean.sh
+++ b/t/t2500-clean.sh
@@ -32,10 +32,10 @@ test_expect_success 'Create a conflict' '
     stg new p2 -m p2
     echo quux > foo.txt &&
     stg refresh &&
     stg new p2 -m p2
     echo quux > foo.txt &&
     stg refresh &&

-    ! stg push
+    conflict_old stg push

 '
 
 '
 

-test_expect_failure 'Make sure conflicting patches are preserved' '
+test_expect_success 'Make sure conflicting patches are preserved' '

     stg clean &&
     [ "$(echo $(stg applied))" = "p0 p2 p1" ] &&
     [ "$(echo $(stg unapplied))" = "" ]
     stg clean &&
     [ "$(echo $(stg applied))" = "p0 p2 p1" ] &&
     [ "$(echo $(stg unapplied))" = "" ]