Merge remote-tracking branch 'origin/feat/update' into dev
# Conflicts: # src/client/client_cli.c # src/client/usage.c # src/shared/file.c # src/shared/file.h # src/shared/file_receive.c # tests/test_client_cli.c
This commit is contained in:
@@ -474,6 +474,61 @@ class TestIncremental:
|
||||
assert not mismatches, f"Mismatch: {mismatches}"
|
||||
|
||||
|
||||
class TestUpdate:
|
||||
def test_update_skips_older_destination_and_allows_equal_or_newer_source(self, shared_server):
|
||||
clean_dir(DEST_DIR)
|
||||
result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=["-u"], port=shared_server.port)
|
||||
assert result.returncode == 0
|
||||
|
||||
received = get_dest_received_dir(DEST_DIR, SOURCE_DIR)
|
||||
source_file = os.path.join(SOURCE_DIR, "small.txt")
|
||||
received_file = os.path.join(received, "small.txt")
|
||||
source_stat = os.stat(source_file)
|
||||
|
||||
with open(received_file, "wb") as f:
|
||||
f.write(b"newer destination\n")
|
||||
os.utime(received_file, ns=(source_stat.st_atime_ns, source_stat.st_mtime_ns + 10_000_000_000))
|
||||
result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=["-u"], port=shared_server.port)
|
||||
assert result.returncode == 0
|
||||
with open(received_file, "rb") as f:
|
||||
assert f.read() == b"newer destination\n"
|
||||
|
||||
os.utime(received_file, ns=(source_stat.st_atime_ns, source_stat.st_mtime_ns))
|
||||
result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=["-u"], port=shared_server.port)
|
||||
assert result.returncode == 0
|
||||
with open(received_file, "rb") as f:
|
||||
assert f.read() == b"hello world\n"
|
||||
|
||||
def test_update_skips_unreadable_newer_destination(self, shared_server):
|
||||
clean_dir(DEST_DIR)
|
||||
result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=["-u"], port=shared_server.port)
|
||||
assert result.returncode == 0
|
||||
|
||||
received_file = os.path.join(get_dest_received_dir(DEST_DIR, SOURCE_DIR), "small.txt")
|
||||
source_stat = os.stat(os.path.join(SOURCE_DIR, "small.txt"))
|
||||
with open(received_file, "wb") as f:
|
||||
f.write(b"protected destination\n")
|
||||
os.utime(received_file, ns=(source_stat.st_atime_ns, source_stat.st_mtime_ns + 10_000_000_000))
|
||||
original_mode = os.stat(received_file).st_mode
|
||||
try:
|
||||
os.chmod(received_file, 0)
|
||||
result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=["-u"], port=shared_server.port)
|
||||
assert result.returncode == 0
|
||||
os.chmod(received_file, original_mode)
|
||||
with open(received_file, "rb") as f:
|
||||
assert f.read() == b"protected destination\n"
|
||||
finally:
|
||||
os.chmod(received_file, original_mode)
|
||||
|
||||
with open(received_file, "wb") as f:
|
||||
f.write(b"older destination\n")
|
||||
os.utime(received_file, ns=(source_stat.st_atime_ns, source_stat.st_mtime_ns - 10_000_000_000))
|
||||
result, _ = run_client(SOURCE_DIR, DEST_DIR, flags=["-u"], port=shared_server.port)
|
||||
assert result.returncode == 0
|
||||
with open(received_file, "rb") as f:
|
||||
assert f.read() == b"hello world\n"
|
||||
|
||||
|
||||
class TestDelete:
|
||||
def test_delete_removes_extra_files(self, shared_server):
|
||||
clean_dir(DEST_DIR)
|
||||
|
||||
+15
-2
@@ -394,8 +394,6 @@ static void test_parse_args_rejects_unimplemented_options() {
|
||||
"--out-format",
|
||||
"--info",
|
||||
"--list-only",
|
||||
"-u",
|
||||
"--update",
|
||||
"--append",
|
||||
"--append-verify",
|
||||
"--delete-excluded",
|
||||
@@ -465,6 +463,20 @@ static void test_parse_args_human_readable() {
|
||||
}
|
||||
}
|
||||
|
||||
static void test_parse_args_update() {
|
||||
Config* cfg = config_create();
|
||||
char* argv[] = {"fastsync", "-u", "/src", "/dst"};
|
||||
int positional_args[2];
|
||||
int positional_count = 0;
|
||||
|
||||
EXPECT_EQ_INT(parse_args(cfg, 4, argv, positional_args, &positional_count), 0);
|
||||
EXPECT_TRUE(cfg->update);
|
||||
EXPECT_TRUE(cfg->use_metadata);
|
||||
EXPECT_EQ_INT(positional_count, 2);
|
||||
|
||||
config_delete(cfg);
|
||||
}
|
||||
|
||||
/* Test parse_args with --archive flag */
|
||||
static void test_parse_args_archive() {
|
||||
Config* cfg = config_create();
|
||||
@@ -634,6 +646,7 @@ void test_client_cli() {
|
||||
test_parse_args_rejects_unimplemented_options();
|
||||
test_parse_args_quiet();
|
||||
test_parse_args_human_readable();
|
||||
test_parse_args_update();
|
||||
test_parse_args_archive();
|
||||
test_parse_args_fsync();
|
||||
test_parse_args_ignore_times();
|
||||
|
||||
Reference in New Issue
Block a user