averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ua/t1517-short-help-tests'

Browse Source 
Test shuffling.

* ua/t1517-short-help-tests:
  t5304: move `prune -h` test from t1517
  t5200: move `update-server-info -h` test from t1517
  t/t1517: automate `git subcmd -h` tests outside a repository
This commit is contained in:
Junio C Hamano
2025-08-21 13:47:01 -07:00
parent 9e99f0e4ef 529a60a885
commit 0cdf09b630
3 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
t/t1517-outside-repo.sh
View File

@@ -107,18 +107,32 @@ test_expect_success LIBCURL 'remote-http outside repository' '
test_grep "^error: remote-curl" actual
'
test_expect_success 'update-server-info does not crash with -h' '
test_expect_code 129 git update-server-info -h >usage &&
test_grep "[Uu]sage: git update-server-info " usage &&
test_expect_code 129 nongit git update-server-info -h >usage &&
test_grep "[Uu]sage: git update-server-info " usage
'
test_expect_success 'prune does not crash with -h' '
test_expect_code 129 git prune -h >usage &&
test_grep "[Uu]sage: git prune " usage &&
test_expect_code 129 nongit git prune -h >usage &&
test_grep "[Uu]sage: git prune " usage
'
for cmd in $(git --list-cmds=main)
do
cmd=${cmd%.*} # strip .sh, .perl, etc.
case "$cmd" in
archimport | cvsexportcommit | cvsimport | cvsserver | daemon | \
difftool--helper | filter-branch | fsck-objects | get-tar-commit-id | \
http-backend | http-fetch | http-push | init-db | \
merge-octopus | merge-one-file | merge-resolve | mergetool | \
mktag | p4 | p4.py | pickaxe | remote-ftp | remote-ftps | \
remote-http | remote-https | replay | send-email | \
sh-i18n--envsubst | shell | show | stage | submodule | svn | \
upload-archive--writer | upload-pack | web--browse | whatchanged)
expect_outcome=expect_failure ;;
*)
expect_outcome=expect_success ;;
esac
case "$cmd" in
instaweb)
prereq=PERL ;;
*)
prereq= ;;
esac
test_$expect_outcome $prereq "'git $cmd -h' outside a repository" '
test_expect_code 129 nongit git $cmd -h >usage &&
test_grep "[Uu]sage: git $cmd " usage
'
done
test_done

5
t/t5200-update-server-info.sh
View File

@@ -46,4 +46,9 @@ test_expect_success 'midx does not create duplicate pack entries' '
test_must_be_empty dups
'
test_expect_success 'update-server-info does not crash with -h' '
test_expect_code 129 git update-server-info -h >usage &&
test_grep "[Uu]sage: git update-server-info " usage
'
test_done

5
t/t5304-prune.sh
View File

@@ -364,4 +364,9 @@ test_expect_success 'gc.recentObjectsHook' '
git cat-file -p $BLOB
'
test_expect_success 'prune does not crash with -h' '
test_expect_code 129 git prune -h >usage &&
test_grep "[Uu]sage: git prune " usage
'
test_done