Fourth batch

diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index 79765a4a4e120d921f764899887b1657ffe6569c..0db7ab99184add2c500f821659b09cc833c6a225 100755 (executable)
--- a/t/t9818-git-p4-block.sh
+++ b/t/t9818-git-p4-block.sh
@@ -8,6 +8,19 @@ test_expect_success 'start p4d' '
        start_p4d
 '
 
+create_restricted_group() {
+       p4 group -i <<-EOF
+       Group: restricted
+       MaxResults: 7
+       MaxScanRows: 40
+       Users: author
+       EOF
+}
+
+test_expect_success 'Create group with limited maxrows' '
+       create_restricted_group
+'
+
 test_expect_success 'Create a repo with many changes' '
        (
                client_view "//depot/included/... //client/included/..." \
@@ -32,6 +45,10 @@ test_expect_success 'Create a repo with many changes' '
        )
 '
 
+test_expect_success 'Default user cannot fetch changes' '
+       ! p4 changes -m 1 //depot/...
+'
+
 test_expect_success 'Clone the repo' '
        git p4 clone --dest="$git" --changes-block-size=7 --verbose //depot/included@all
 '
@@ -67,7 +84,7 @@ p4_add_file() {
        (cd "$cli" &&
                >$1 &&
                p4 add $1 &&
-               p4 submit -d "Added a file" $1
+               p4 submit -d "Added file $1" $1
        )
 }
 
@@ -95,8 +112,38 @@ test_expect_success 'Syncing files' '
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
+# Handling of multiple depot paths:
+#    git p4 clone //depot/pathA //depot/pathB
+#
+test_expect_success 'Create a repo with multiple depot paths' '
+       client_view "//depot/pathA/... //client/pathA/..." \
+                   "//depot/pathB/... //client/pathB/..." &&
+       mkdir -p "$cli/pathA" "$cli/pathB" &&
+       for p in pathA pathB
+       do
+               for i in $(test_seq 1 10)
+               do
+                       p4_add_file "$p/file$p$i"
+               done
+       done
+'
+
+test_expect_success 'Clone repo with multiple depot paths' '
+       test_when_finished cleanup_git &&
+       (
+               cd "$git" &&
+               git p4 clone --changes-block-size=4 //depot/pathA@all //depot/pathB@all \
+                       --destination=dest &&
+               ls -1 dest >log &&
+               test_line_count = 20 log
+       )
+'
+
+test_expect_success 'Clone repo with self-sizing block size' '
+       test_when_finished cleanup_git &&
+       git p4 clone --changes-block-size=1000000 //depot@all --destination="$git" &&
+       git -C "$git" log --oneline >log &&
+       test_line_count \> 10 log
 '
 
 test_done