Skip to content

Commit 98eab3c

Browse files
ngallodevngallodev
committed
Merge branch 'sync/upstream-13m2-20261108' into sync/upstream-13n-20261108
Brings the Hermes hook test fix (0f1927f) from 13M-2 into 13N.
2 parents cf24b6a + 0f1927f commit 98eab3c

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

‎tests/test_cli.c‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7988,9 +7988,9 @@ static bool cli_hermes_cycle_open(cli_hermes_cycle_t *cycle, const char *initial
79887988
snprintf(cycle->config_path, sizeof(cycle->config_path), "%s/config.yaml", hermes_dir);
79897989
#ifdef _WIN32
79907990
snprintf(cycle->binary_path, sizeof(cycle->binary_path),
7991-
"%s/.local/bin/codebase-memory-mcp.exe", cycle->tmpdir);
7991+
"%s/.local/bin/codebase-memory-cli.exe", cycle->tmpdir);
79927992
#else
7993-
snprintf(cycle->binary_path, sizeof(cycle->binary_path), "%s/.local/bin/codebase-memory-mcp",
7993+
snprintf(cycle->binary_path, sizeof(cycle->binary_path), "%s/.local/bin/codebase-memory-cli",
79947994
cycle->tmpdir);
79957995
#endif
79967996
test_mkdirp(hermes_dir);
@@ -8022,13 +8022,15 @@ TEST(cli_hermes_hook_reinstalls_after_uninstall_empties_hooks) {
80228022
FAIL("Hermes fake-HOME setup failed");
80238023
}
80248024
char *argv[] = {"uninstall", "--yes"};
8025-
int install_rc = cbm_install_agent_configs(cycle.tmpdir, cycle.binary_path, false, false);
8025+
int install_rc =
8026+
cbm_install_agent_hooks_for_testing(cycle.tmpdir, cycle.binary_path, false, false);
80268027
char *installed = read_test_file_alloc(cycle.config_path);
80278028
int uninstall_rc = cli_test_cmd_uninstall(2, argv);
80288029
char *emptied = read_test_file_alloc(cycle.config_path);
80298030
int repeat_rc = cli_test_cmd_uninstall(2, argv);
80308031
char *repeated = read_test_file_alloc(cycle.config_path);
8031-
int reinstall_rc = cbm_install_agent_configs(cycle.tmpdir, cycle.binary_path, false, false);
8032+
int reinstall_rc =
8033+
cbm_install_agent_hooks_for_testing(cycle.tmpdir, cycle.binary_path, false, false);
80328034
char *reinstalled = read_test_file_alloc(cycle.config_path);
80338035
cli_hermes_cycle_close(&cycle);
80348036

@@ -8071,11 +8073,13 @@ TEST(cli_hermes_hook_cycle_keeps_foreign_pre_llm_hook) {
80718073
FAIL("Hermes fake-HOME setup failed");
80728074
}
80738075
char *argv[] = {"uninstall", "--yes"};
8074-
int install_rc = cbm_install_agent_configs(cycle.tmpdir, cycle.binary_path, false, false);
8076+
int install_rc =
8077+
cbm_install_agent_hooks_for_testing(cycle.tmpdir, cycle.binary_path, false, false);
80758078
char *installed = read_test_file_alloc(cycle.config_path);
80768079
int uninstall_rc = cli_test_cmd_uninstall(2, argv);
80778080
char *restored = read_test_file_alloc(cycle.config_path);
8078-
int reinstall_rc = cbm_install_agent_configs(cycle.tmpdir, cycle.binary_path, false, false);
8081+
int reinstall_rc =
8082+
cbm_install_agent_hooks_for_testing(cycle.tmpdir, cycle.binary_path, false, false);
80798083
char *reinstalled = read_test_file_alloc(cycle.config_path);
80808084
cli_hermes_cycle_close(&cycle);
80818085

0 commit comments

Comments
 (0)