New policy: Only use test_expect_failure for broken tests

[stgit] / t / t2102-pull-policy-rebase.sh

diff --git a/t/t2102-pull-policy-rebase.sh b/t/t2102-pull-policy-rebase.sh
index 41f8168..b2fbfcf 100755 (executable)
--- a/t/t2102-pull-policy-rebase.sh
+++ b/t/t2102-pull-policy-rebase.sh
@@ -10,8 +10,8 @@ test_description='Excercise pull-policy "rebase".'
 test_expect_success \
     'Fork stack off parent branch, and add patches to the stack' \
     '
-    stg init &
     git branch -m master parent &&
+    stg init &&
     stg branch --create stack &&
     git repo-config branch.stack.stgit.pull-policy rebase &&
     git repo-config --list &&
@@ -46,18 +46,18 @@ test_expect_success \
     stg branch stack && stg commit && stg new c2 -m c2 &&
      echo a >> file && stg refresh
     '
-test_expect_failure \
+test_expect_success \
     'Try to pull/rebase now that stack base has moved' \
-    'stg pull'
+    '! stg pull'
 
 test_expect_success \
     'Force the pull/rebase, but do not push yet' \
     'stg pull --force --nopush'
-test_expect_failure \
+test_expect_success \
     '...check we lost the committed patch' \
-    'test -e file'
-test_expect_failure \
+    '! test -e file'
+test_expect_success \
     '...and check we get a conflict while pushing' \
-    'stg push'
+    '! stg push'
 
 test_done