Change the --changes-block-size git-p4 test to use an account with
limited maxresults and maxscanrows values.
These conditions are applied in the server *before* the -m maxchanges
parameter to p4 changes is applied, and so the strategy that git-p4
uses for limiting the number of changes does not work. As a result,
the tests all fail.
Note that maxscanrows is set quite high, as it appears to not only
limit results from p4 changes, but *also* limits results from
p4 print. Files that have more than maxscanrows changes seem
(experimentally) to be impossible to print. There's no good way to
work around this.
Signed-off-by: Luke Diamand l...@diamand.org
---
t/t9818-git-p4-block.sh | 29 +++--
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index 79765a4..aae1121 100755
--- 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,11 +45,15 @@ test_expect_success 'Create a repo with many changes' '
)
'
-test_expect_success 'Clone the repo' '
+test_expect_success 'Default user cannot fetch changes' '
+ ! p4 changes -m 1 //depot/...
+'
+
+test_expect_failure 'Clone the repo' '
git p4 clone --dest=$git --changes-block-size=7 --verbose
//depot/included@all
'
-test_expect_success 'All files are present' '
+test_expect_failure 'All files are present' '
echo file.txt expected
test_write_lines outer0.txt outer1.txt outer2.txt outer3.txt outer4.txt
expected
test_write_lines outer5.txt expected
@@ -44,18 +61,18 @@ test_expect_success 'All files are present' '
test_cmp expected current
'
-test_expect_success 'file.txt is correct' '
+test_expect_failure 'file.txt is correct' '
echo 55 expected
test_cmp expected $git/file.txt
'
-test_expect_success 'Correct number of commits' '
+test_expect_failure 'Correct number of commits' '
(cd $git git log --oneline) log
wc -l log
test_line_count = 43 log
'
-test_expect_success 'Previous version of file.txt is correct' '
+test_expect_failure 'Previous version of file.txt is correct' '
(cd $git git checkout HEAD^^)
echo 53 expected
test_cmp expected $git/file.txt
@@ -85,7 +102,7 @@ test_expect_success 'Add some more files' '
# This should pick up the 10 new files in included, but not be confused
# by the additional files in excluded
-test_expect_success 'Syncing files' '
+test_expect_failure 'Syncing files' '
(
cd $git
git p4 sync --changes-block-size=7
--
2.3.4.48.g223ab37
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
