diff --git a/eden/mononoke/tests/integration/library.sh b/eden/mononoke/tests/integration/library.sh index 29847aba7e..e4fb85f535 100644 --- a/eden/mononoke/tests/integration/library.sh +++ b/eden/mononoke/tests/integration/library.sh @@ -827,9 +827,8 @@ CONFIG function register_hook { hook_name="$1" - hook_type="$2" - - shift 2 + + shift 1 EXTRA_CONFIG_DESCRIPTOR="" if [[ $# -gt 0 ]]; then EXTRA_CONFIG_DESCRIPTOR="$1" @@ -841,7 +840,6 @@ function register_hook { hook_name="$hook_name" [[hooks]] name="$hook_name" -hook_type="$hook_type" CONFIG [ -n "$EXTRA_CONFIG_DESCRIPTOR" ] && cat "$EXTRA_CONFIG_DESCRIPTOR" ) >> "repos/$REPONAME/server.toml" @@ -1223,15 +1221,14 @@ name="$HOOKBOOKMARK" CONFIG HOOK_NAME="$1" - HOOK_TYPE="$2" - shift 2 + shift 1 EXTRA_CONFIG_DESCRIPTOR="" if [[ $# -gt 0 ]]; then EXTRA_CONFIG_DESCRIPTOR="$1" fi - register_hook "$HOOK_NAME" "$HOOK_TYPE" "$EXTRA_CONFIG_DESCRIPTOR" + register_hook "$HOOK_NAME" "$EXTRA_CONFIG_DESCRIPTOR" setup_common_hg_configs cd "$TESTTMP" || exit 1 diff --git a/eden/mononoke/tests/integration/test-hooks.t b/eden/mononoke/tests/integration/test-hooks.t index 4631e92305..8beef3b0e9 100644 --- a/eden/mononoke/tests/integration/test-hooks.t +++ b/eden/mononoke/tests/integration/test-hooks.t @@ -15,7 +15,7 @@ setup configuration > name="master_bookmark" > CONFIG - $ register_hook limit_filesize PerAddedOrModifiedFile <( + $ register_hook limit_filesize <( > cat < bypass_commit_string="@allow_large_files" > config_ints={filesizelimit=10} diff --git a/eden/mononoke/tests/integration/test-push-redirector-pushrebase-hooks.t b/eden/mononoke/tests/integration/test-push-redirector-pushrebase-hooks.t index c7e7847d33..828c559266 100644 --- a/eden/mononoke/tests/integration/test-push-redirector-pushrebase-hooks.t +++ b/eden/mononoke/tests/integration/test-push-redirector-pushrebase-hooks.t @@ -31,7 +31,6 @@ > hook_name="deny_files" > [[hooks]] > name="deny_files" - > hook_type="PerAddedOrModifiedFile" > CONFIG $ start_large_small_repo --local-configerator-path="$TESTTMP/configerator" Starting Mononoke server diff --git a/eden/mononoke/tests/integration/test-pushrebase-discovery.t b/eden/mononoke/tests/integration/test-pushrebase-discovery.t index 2031605537..93dd6cf609 100644 --- a/eden/mononoke/tests/integration/test-pushrebase-discovery.t +++ b/eden/mononoke/tests/integration/test-pushrebase-discovery.t @@ -22,7 +22,7 @@ setup configuration > name="master_bookmark" > CONFIG - $ register_hook always_fail_changeset PerChangeset <( + $ register_hook always_fail_changeset <( > echo 'bypass_pushvar="BYPASS_REVIEW=true"' > )