diff options
| author | Gabriel Schneider <[email protected]> | 2026-10-30 17:35:06 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-10-30 17:35:06 -0300 |
| commit | 6d8da8721141284cf33bb901168b26135893eb86 (patch) | |
| tree | 791d63401d4e85fbca1d597a8ce0326e70efd545 /test/fs_namespace.zig | |
| parent | efd43a3a2cf03bb741366331158b368abf9ac583 (diff) | |
| parent | bf6810a8f9d6cc82050e7d9c0cfb06358301b574 (diff) | |
| download | pardes-6d8da8721141284cf33bb901168b26135893eb86.tar.gz pardes-6d8da8721141284cf33bb901168b26135893eb86.zip | |
Merge latest upstream into the macOS branch for Zig 0.17
Retain the macOS branch history and local Acme selection color while adopting upstream's current core and platform changes. Pin Zig and ZLS to 0.17.0, and fetch the existing zstbi compatibility commit through upstream after its original fork was removed.
Diffstat (limited to 'test/fs_namespace.zig')
| -rw-r--r-- | test/fs_namespace.zig | 91 |
1 files changed, 36 insertions, 55 deletions
diff --git a/test/fs_namespace.zig b/test/fs_namespace.zig index 8b6f245e..30c656ca 100644 --- a/test/fs_namespace.zig +++ b/test/fs_namespace.zig @@ -6,9 +6,15 @@ test "runtime Mount and Unmount copy command arguments and change Look resolutio const gpa = std.testing.allocator; const p = try pardes.Pardes.init(gpa, .{ .tty_only = true }); defer p.deinit(); - var command = "Mount peer /tmp/a socket.sock".*; - try std.testing.expect(p.executeBuiltinLine(0, &command)); - @memset(&command, 'x'); + // No peer answers at the dial: Mount mounts nothing (it dials first). + try std.testing.expect(p.executeBuiltinLine(0, "Mount peer /tmp/a socket.sock")); + try std.testing.expectEqual(@as(usize, 0), p.fs.mounts.items.len); + // Mounted (as one that answered is), its arguments are copies. + var name = "peer".*; + var dial = "/tmp/a socket.sock".*; + try p.fs.mount(gpa, &name, &dial); + @memset(&name, 'x'); + @memset(&dial, 'x'); try std.testing.expectEqual(@as(usize, 1), p.fs.mounts.items.len); try std.testing.expectEqualStrings("peer", p.fs.mounts.items[0].name); try std.testing.expectEqualStrings("/tmp/a socket.sock", p.fs.mounts.items[0].dial); @@ -40,8 +46,8 @@ test "mounts survive dumps without borrowing inputs or silently overriding a sav file.file.?.revision = 3; gpa.free(file.file.?.path); file.file.?.path = try gpa.dupe(u8, "/n/peer/os/file.txt"); - try p.dumpState(); - const restored = try pardes.Pardes.initFromDump(gpa, .{}, p.dump_out.?); + try pardes.dump.dumpState(p); + const restored = try pardes.dump.initFromDump(gpa, .{}, p.dump_out.?); defer restored.deinit(); try std.testing.expectEqual(@as(usize, 1), restored.fs.mounts.items.len); try std.testing.expectEqualStrings("peer", restored.fs.mounts.items[0].name); @@ -50,13 +56,13 @@ test "mounts survive dumps without borrowing inputs or silently overriding a sav try std.testing.expectEqualStrings("saved remote body\n", restored.panes[0].?.file.?.content); try std.testing.expect(restored.panes[0].?.file.?.revision != restored.panes[0].?.file.?.saved_revision); try std.testing.expectError(error.MountInUse, filesystem.unmount(restored, "peer")); - const same = try pardes.Pardes.initFromDump(gpa, .{ .mounts = &.{.{ .name = "peer", .dial = "/tmp/peer.sock" }} }, p.dump_out.?); + const same = try pardes.dump.initFromDump(gpa, .{ .mounts = &.{.{ .name = "peer", .dial = "/tmp/peer.sock" }} }, p.dump_out.?); defer same.deinit(); try std.testing.expectEqual(@as(usize, 1), same.fs.mounts.items.len); - try std.testing.expectError(error.MountConflict, pardes.Pardes.initFromDump(gpa, .{ + try std.testing.expectError(error.MountConflict, pardes.dump.initFromDump(gpa, .{ .mounts = &.{.{ .name = "peer", .dial = "/tmp/different.sock" }}, }, p.dump_out.?)); - const added = try pardes.Pardes.initFromDump(gpa, .{ .mounts = &.{.{ .name = "other", .dial = "/tmp/other.sock" }} }, p.dump_out.?); + const added = try pardes.dump.initFromDump(gpa, .{ .mounts = &.{.{ .name = "other", .dial = "/tmp/other.sock" }} }, p.dump_out.?); defer added.deinit(); try std.testing.expectEqual(@as(usize, 2), added.fs.mounts.items.len); } @@ -69,8 +75,8 @@ test "removed startup mounts are not resurrected by dump restore" { }); defer p.deinit(); try filesystem.unmount(p, "peer"); - try p.dumpState(); - const restored = try pardes.Pardes.initFromDump(gpa, p.opts, p.dump_out.?); + try pardes.dump.dumpState(p); + const restored = try pardes.dump.initFromDump(gpa, p.opts, p.dump_out.?); defer restored.deinit(); try std.testing.expectEqual(@as(usize, 0), restored.fs.mounts.items.len); } @@ -81,30 +87,29 @@ test "transactional restore preserves host capabilities and advances pane identi defer p.deinit(); const pane = try p.setTestFile("before\n"); p.lsp_seq = 41; - p.pipe_seq = 73; + p.pipe.seq = 73; if (@hasField(pardes.CellPixels, "w")) p.cell_pixels = .{ .w = 9, .h = 18 }; p.native_images = true; p.fs.socket_path = "/tmp/session.sock"; p.fs.tcp_address = .{ .ip4 = .loopback(5640) }; p.fs.quic_address = .{ .ip6 = .loopback(5641) }; - try p.dumpState(); - const restored = try p.restore(p.dump_out.?); + try pardes.dump.dumpState(p); + const restored = try pardes.dump.restore(p, p.dump_out.?, "test"); defer restored.deinit(); try std.testing.expectEqual(@as(u32, 41), restored.lsp_seq); - try std.testing.expectEqual(@as(u32, 73), restored.pipe_seq); + try std.testing.expectEqual(@as(u32, 73), restored.pipe.seq); try std.testing.expectEqual(p.cell_pixels, restored.cell_pixels); try std.testing.expect(restored.native_images); try std.testing.expect(restored.panes[0].?.serial > p.next_serial); try std.testing.expect(restored.paneBySerial(pane.serial) == null); try std.testing.expectEqual(p.screen_w, restored.screen_w); try std.testing.expectEqual(p.screen_h, restored.screen_h); - try std.testing.expectEqualStrings(p.fs.socket_path, restored.fs.socket_path); - try std.testing.expectEqualDeep(p.fs.tcp_address, restored.fs.tcp_address); - try std.testing.expectEqualDeep(p.fs.quic_address, restored.fs.quic_address); try std.testing.expect(p.panes[0] == pane); try std.testing.expectEqualStrings("before\n", pane.file.?.content); - try std.testing.expectError(error.BadDumpMagic, p.restore( + try std.testing.expectError(error.BadDumpMagic, pardes.dump.restore( + p, ".{ .magic = \"wrong\", .screen = .{.cols = 80, .rows = 24} }", + "test", )); try std.testing.expect(p.panes[0] == pane); try std.testing.expectEqualStrings("before\n", pane.file.?.content); @@ -112,27 +117,6 @@ test "transactional restore preserves host capabilities and advances pane identi try std.testing.expectEqualStrings("/tmp/session.sock", p.fs.socket_path); } -test "same-session identity is available before an initial mounted file is opened" { - if (!filesystem.platform_has_fs) return error.SkipZigTest; - const gpa = std.testing.allocator; - var tmp = std.testing.tmpDir(.{}); - defer tmp.cleanup(); - try tmp.dir.writeFile(std.testing.io, .{ .sub_path = "file.txt", .data = "no socket required\n" }); - var buf: [4096]u8 = undefined; - const len = try tmp.dir.realPathFile(std.testing.io, "file.txt", &buf); - const path = try std.fmt.allocPrint(gpa, "/n/own/os{s}", .{buf[0..len]}); - defer gpa.free(path); - const p = try pardes.Pardes.init(gpa, .{ - .file = path, - .mounts = &.{.{ .name = "own", .dial = "/tmp/not-listening.sock" }}, - .ninep_identity = .{ .socket_path = "/tmp/not-listening.sock" }, - }); - defer p.deinit(); - try std.testing.expectEqualStrings(path, p.panes[0].?.file.?.path); - try std.testing.expectEqualStrings("no socket required\n", p.panes[0].?.file.?.content); - try std.testing.expectEqualStrings("", p.opts.ninep_identity.socket_path); -} - test "filesystem resolves OS first then virtual with explicit mounts and parent paths" { if (!filesystem.platform_has_fs) return error.SkipZigTest; const gpa = std.testing.allocator; @@ -222,7 +206,8 @@ test "explicit OS file opens and restores keep their names and request watches" .kind = .file, .tag = path, .body = "", - .file = .{ .path = path, .content = "const unsaved = 2;\n" }, + // Unsaved text: kept (a clean pane's is read from disk). + .file = .{ .path = path, .content = "const unsaved = 2;\n", .dirty = true }, }); try std.testing.expectEqualStrings(path, copy.file.?.path); try std.testing.expectEqualStrings("const unsaved = 2;\n", copy.file.?.content); @@ -245,22 +230,17 @@ test "virtual file opens do not request OS watches" { while (p.nextEffect()) |effect| if (effect == .watch) return error.VirtualFileWatch; } -test "Look at the clone file reserves its own pane and failed opens release it" { +test "Look at a virtual file opens one pane and failed opens release their slot" { const p = try pardes.Pardes.init(std.testing.allocator, .{ .tty_only = true }); defer p.deinit(); - p.lookAt(0, "/virtual/new"); - var control_count: usize = 0; - var scratch_count: usize = 0; + pardes.look.lookAt(p, 0, "/virtual/index"); + var opened: usize = 0; for (p.panes) |slot| { const pane = slot orelse continue; const file = pane.file orelse continue; - if (std.mem.eql(u8, file.path, "/virtual/new")) control_count += 1; - if (file.output) |output| if (output.from == .cmd and output.from.cmd == .New) { - scratch_count += 1; - }; + if (std.mem.eql(u8, file.path, "/virtual/index")) opened += 1; } - try std.testing.expectEqual(@as(usize, 1), control_count); - try std.testing.expectEqual(@as(usize, 1), scratch_count); + try std.testing.expectEqual(@as(usize, 1), opened); const free = p.freeSlot().?; try std.testing.expectError(error.FileNotFound, pardes.panes.File.open(p, free, "/n/self/does-not-exist", 0)); try std.testing.expect(p.panes[free] == null); @@ -306,7 +286,7 @@ test "owned cwd failed file opens never publish a pane or retain a reservation" try std.testing.expect(succeeded); } -test "images decode and dump through explicit filesystem mounts" { +test "images decode through explicit filesystem mounts, and a dump reads one on disk from there" { if (!filesystem.platform_has_fs) return error.SkipZigTest; const gpa = std.testing.allocator; pardes.image.start(std.testing.io, gpa); @@ -328,8 +308,9 @@ test "images decode and dump through explicit filesystem mounts" { const state = pane.image.?; try std.testing.expectEqual(@as(usize, 1), state.iw); try std.testing.expectEqual(@as(usize, 1), state.ih); - const saved = try pardes.panes.Image.dumpPane(p, arena.allocator(), pane, "", "", 0, path, &.{}); - const decoded = try pardes.dump.decodeBytes(gpa, saved.image.?.bytes_b64); - defer gpa.free(decoded); - try std.testing.expectEqualStrings(bytes, decoded); + // On disk, the picture is no part of the dump: Restore reads it there. + const saved = try pardes.panes.Image.dumpPane(p, arena.allocator(), pane, "", "", 0, path, state.raw); + try std.testing.expectEqualStrings("", saved.image.?.bytes_b64); + const restored = try pardes.panes.Image.restore(p, p.freeSlot().?, saved); + try std.testing.expectEqualStrings(bytes, restored.image.?.raw); } |
