From c973015134439540d96d9d1bbee4155188f57d45 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 1 Aug 2021 11:38:34 +0300 Subject: fix the lately broken --repo flag --- cgitize/main.py | 2 +- test/integration/example/test.sh | 32 +++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/cgitize/main.py b/cgitize/main.py index 9497cad..08d18df 100644 --- a/cgitize/main.py +++ b/cgitize/main.py @@ -37,7 +37,7 @@ def main(args=None): output = CGitRepositories(config.main.output_dir, cgit_server, force=args.force) success = True for repo in config.parse_repositories(): - if args.repos is None or repo.repo_id in args.repos: + if args.repos is None or repo.name in args.repos: if not output.update(repo): success = False if success: diff --git a/test/integration/example/test.sh b/test/integration/example/test.sh index 4d8ab3a..9345360 100755 --- a/test/integration/example/test.sh +++ b/test/integration/example/test.sh @@ -35,7 +35,7 @@ cgitize() { echo Running cgitize echo ---------------------------------------------------------------------- - python3 -m cgitize.main --config "$cgitize_toml_path" + python3 -m cgitize.main --config "$cgitize_toml_path" "$@" } setup_ssh() { @@ -96,6 +96,22 @@ verify_repos() { done } +verify_no_repos() { + local repo + for repo; do + echo + echo ---------------------------------------------------------------------- + echo "Verifying repository doesn't exist: $repo" + echo ---------------------------------------------------------------------- + + local repo_dir="$output_dir/$repo" + if [ -e "$repo_dir" ]; then + echo "Exists, but it shouldn't." + return 1 + fi + done +} + test_ssh() { echo echo ====================================================================== @@ -124,6 +140,19 @@ test_https() { cleanup } +test_one_repo() { + echo + echo ====================================================================== + echo "${FUNCNAME[0]}" + echo ====================================================================== + + setup_https + cgitize --repo cef + verify_repos cef + verify_no_repos lens wintun + cleanup +} + main() { trap cleanup EXIT if [ -z "${CI+y}" ]; then @@ -132,6 +161,7 @@ main() { test_ssh fi test_https + test_one_repo } main -- cgit v1.2.3