Test for specific exit code

[stgit] / t / t2000-sync.sh

diff --git a/t/t2000-sync.sh b/t/t2000-sync.sh
index e489603f3fa4d7d64c31cd52e17f8fd193242911..9852eb87e3c6efab6d5ca859739bdb14de753944 100755 (executable)
--- a/t/t2000-sync.sh
+++ b/t/t2000-sync.sh
@@ -109,7 +109,7 @@ test_expect_success \
 test_expect_success \
     'Synchronise the first two patches with the master branch (to fail)' \
     '
 test_expect_success \
     'Synchronise the first two patches with the master branch (to fail)' \
     '

-    ! stg sync -B master -a
+    conflict_old stg sync -B master -a

     '
 
 test_expect_success \
     '
 
 test_expect_success \


@@ -127,7 +127,7 @@ test_expect_success \
 test_expect_success \
     'Synchronise the third patch with the exported series (to fail)' \
     '
 test_expect_success \
     'Synchronise the third patch with the exported series (to fail)' \
     '

-    ! stg sync -s patches-master/series p3
+    conflict_old stg sync -s patches-master/series p3

     '
 
 test_expect_success \
     '
 
 test_expect_success \