Test operations on hidden patches

[stgit] / t / t0001-subdir-branches.sh

diff --git a/t/t0001-subdir-branches.sh b/t/t0001-subdir-branches.sh
index 1685233401df71738c5ef935a594cc29939dab2e..69c11a3e24dc7578adc62b04da77b4ae52f8df0a 100755 (executable)
--- a/t/t0001-subdir-branches.sh
+++ b/t/t0001-subdir-branches.sh
@@ -38,10 +38,11 @@ test_expect_success 'Try new form of id with slashy branch' \
    stg id foo@x/y/z &&
    stg id foo@x/y/z//top'
 
    stg id foo@x/y/z &&
    stg id foo@x/y/z//top'
 

-test_expect_failure 'Try old id with slashy branch' \
-  'stg id foo/ ||
-   stg id foo/top ||
-   stg id foo@x/y/z/top'
+test_expect_success 'Try old id with slashy branch' '
+   command_error stg id foo/ &&
+   command_error stg id foo/top &&
+   command_error stg id foo@x/y/z/top
+   '

 
 test_expect_success 'Create patch in slashy branch' \
   'echo "bar" >> foo.txt &&
 
 test_expect_success 'Create patch in slashy branch' \
   'echo "bar" >> foo.txt &&


@@ -50,11 +51,11 @@ test_expect_success 'Create patch in slashy branch' \
 
 test_expect_success 'Rename branches' \
   'stg branch --rename master goo/gaa &&
 
 test_expect_success 'Rename branches' \
   'stg branch --rename master goo/gaa &&

-   ! git show-ref --verify --quiet refs/heads/master &&
+   must_fail git show-ref --verify --quiet refs/heads/master &&

    stg branch --rename goo/gaa x1/x2/x3/x4 &&
    stg branch --rename goo/gaa x1/x2/x3/x4 &&

-   ! git show-ref --verify --quiet refs/heads/goo/gaa &&
+   must_fail git show-ref --verify --quiet refs/heads/goo/gaa &&

    stg branch --rename x1/x2/x3/x4 servant &&
    stg branch --rename x1/x2/x3/x4 servant &&

-   ! git show-ref --verify --quiet refs/heads/x1/x2/x3/x4
+   must_fail git show-ref --verify --quiet refs/heads/x1/x2/x3/x4

 '
 
 test_done
 '
 
 test_done