Merge remote-tracking branch 'origin/feat/whole-file' into dev
# Conflicts: # tests/test_client_cli.c # tests/test_config.c
This commit is contained in:
@@ -60,6 +60,13 @@ static void test_validate_config_delta_sendfile_constraints() {
|
||||
cfg->use_incremental = true;
|
||||
cfg->use_sendfile = true;
|
||||
EXPECT_FALSE(validate_config(cfg));
|
||||
|
||||
/* Whole-file makes delta selection inactive, so these combinations are valid. */
|
||||
cfg->whole_file = true;
|
||||
EXPECT_TRUE(validate_config(cfg));
|
||||
|
||||
cfg->use_incremental = false;
|
||||
EXPECT_TRUE(validate_config(cfg));
|
||||
config_delete(cfg);
|
||||
}
|
||||
|
||||
@@ -507,6 +514,27 @@ static void test_parse_args_rejects_unsupported_stderr_modes() {
|
||||
}
|
||||
log_set_stderr_mode(LOG_STDERR_ERRORS);
|
||||
}
|
||||
|
||||
/* Test both whole-file spellings and its precedence over delta selection. */
|
||||
static void test_parse_args_whole_file() {
|
||||
Config* cfg = config_create();
|
||||
char* argv[] = {"fastsync", "--delta", "--incremental", "-W", "/src", "/dst"};
|
||||
int positional_args[2];
|
||||
int positional_count = 0;
|
||||
|
||||
EXPECT_EQ_INT(parse_args(cfg, 6, argv, positional_args, &positional_count), 0);
|
||||
EXPECT_TRUE(cfg->whole_file);
|
||||
EXPECT_TRUE(cfg->use_delta);
|
||||
|
||||
config_delete(cfg);
|
||||
cfg = config_create();
|
||||
char* long_argv[] = {"fastsync", "--whole-file", "/src", "/dst"};
|
||||
positional_count = 0;
|
||||
EXPECT_EQ_INT(parse_args(cfg, 4, long_argv, positional_args, &positional_count), 0);
|
||||
EXPECT_TRUE(cfg->whole_file);
|
||||
config_delete(cfg);
|
||||
}
|
||||
|
||||
void test_client_cli() {
|
||||
test_validate_config_required_paths();
|
||||
test_validate_config_incompatible_options();
|
||||
@@ -541,4 +569,5 @@ void test_client_cli() {
|
||||
test_parse_args_rejects_unsupported_stderr_modes();
|
||||
test_parse_args_secluded_args();
|
||||
test_parse_args_short_s_remains_chunk_serialization();
|
||||
test_parse_args_whole_file();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user