fix: make rsync info none override verbose
CI / lint (pull_request) Successful in 12s
CI / sanitizers (address) (pull_request) Successful in 36s
CI / sanitizers (undefined) (pull_request) Successful in 36s
CI / fuzz-build (pull_request) Successful in 16s
CI / coverage (pull_request) Successful in 32s
CI / build-and-test (pull_request) Successful in 1m16s
CI / valgrind (pull_request) Successful in 33s
CI / lint (pull_request) Successful in 12s
CI / sanitizers (address) (pull_request) Successful in 36s
CI / sanitizers (undefined) (pull_request) Successful in 36s
CI / fuzz-build (pull_request) Successful in 16s
CI / coverage (pull_request) Successful in 32s
CI / build-and-test (pull_request) Successful in 1m16s
CI / valgrind (pull_request) Successful in 33s
This commit is contained in:
@@ -295,6 +295,19 @@ class TestInfo:
|
||||
assert result.returncode != 0
|
||||
assert "unsupported --info flag" in result.stderr
|
||||
|
||||
@pytest.mark.parametrize("flags", [
|
||||
["--info=none", "--verbose"],
|
||||
["--verbose", "--info=none"],
|
||||
])
|
||||
def test_info_none_suppresses_verbose_info(self, shared_server, flags):
|
||||
clean_dir(DEST_DIR)
|
||||
result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=flags, port=shared_server.port)
|
||||
assert result.returncode == 0, f"Info sync failed: {(result.stderr or result.stdout)[:200]}"
|
||||
output = result.stdout + result.stderr
|
||||
assert "[INFO]" not in output
|
||||
assert "Transferring" not in output
|
||||
assert "Transfer summary:" not in output
|
||||
|
||||
|
||||
class TestBandwidthLimit:
|
||||
def test_bwlimit_runs(self, shared_server):
|
||||
|
||||
+13
-4
@@ -336,13 +336,22 @@ static void test_parse_args_info_flags() {
|
||||
}
|
||||
|
||||
static void test_parse_args_info_verbose_order() {
|
||||
Config* cfg = config_create();
|
||||
char* argv[] = {"fastsync", "--info=copy", "--verbose", "/src", "/dst"};
|
||||
char* argv_info_first[] = {"fastsync", "--info=none", "--verbose", "/src", "/dst"};
|
||||
char* argv_verbose_first[] = {"fastsync", "--verbose", "--info=none", "/src", "/dst"};
|
||||
int positional_args[2];
|
||||
int positional_count = 0;
|
||||
|
||||
EXPECT_EQ_INT(parse_args(cfg, 5, argv, positional_args, &positional_count), 0);
|
||||
EXPECT_EQ_INT(get_log_info_flags(), LOG_INFO_COPY);
|
||||
Config* cfg = config_create();
|
||||
EXPECT_EQ_INT(parse_args(cfg, 5, argv_info_first, positional_args, &positional_count), 0);
|
||||
EXPECT_EQ_INT(cfg->info_level, 0);
|
||||
EXPECT_EQ_INT(get_log_info_flags(), 0);
|
||||
config_delete(cfg);
|
||||
|
||||
cfg = config_create();
|
||||
positional_count = 0;
|
||||
EXPECT_EQ_INT(parse_args(cfg, 5, argv_verbose_first, positional_args, &positional_count), 0);
|
||||
EXPECT_EQ_INT(cfg->info_level, 0);
|
||||
EXPECT_EQ_INT(get_log_info_flags(), 0);
|
||||
config_delete(cfg);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user