Fourth batch

diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
index 871544b1c9dc78de64b4c2ced2b1b74d3c1dc577..d743ca33ee6ab29f97d328756663803824f105f5 100755 (executable)
--- a/t/t9831-git-p4-triggers.sh
+++ b/t/t9831-git-p4-triggers.sh
@@ -13,14 +13,14 @@ test_expect_success 'init depot' '
                cd "$cli" &&
                echo file1 >file1 &&
                p4 add file1 &&
-               p4 submit -d "change 1"
+               p4 submit -d "change 1" &&
                echo file2 >file2 &&
                p4 add file2 &&
                p4 submit -d "change 2"
        )
 '
 
-test_expect_failure 'clone with extra info lines from verbose p4 trigger' '
+test_expect_success 'clone with extra info lines from verbose p4 trigger' '
        test_when_finished cleanup_git &&
        (
                p4 triggers -i <<-EOF
@@ -38,7 +38,7 @@ test_expect_failure 'clone with extra info lines from verbose p4 trigger' '
        )
 '
 
-test_expect_failure 'import with extra info lines from verbose p4 trigger' '
+test_expect_success 'import with extra info lines from verbose p4 trigger' '
        test_when_finished cleanup_git &&
        (
                cd "$cli" &&
@@ -96,8 +96,4 @@ test_expect_success 'submit description with extra info lines from verbose p4 ch
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done