@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ lib, ... }:
1+import ./make-test-python.nix ({ lib, pkgs, ... }:
22{
33 name = "bees";
44
@@ -29,27 +29,34 @@ import ./make-test.nix ({ lib, ... }:
2929
3030 testScript =
3131 let
32− withRetry = content: maxTests: sleepTime: ''
33− max_tests=${lib.escapeShellArg maxTests}; sleep_time=${lib.escapeShellArg sleepTime}; for ((i=0; i<max_tests; i++)); do ${content} && exit 0; sleep "$sleep_time"; done; exit 1;
32+ someContentIsShared = loc: pkgs.writeShellScript "some-content-is-shared" ''
33+ [[ $(btrfs fi du -s --raw ${lib.escapeShellArg loc}/dedup-me-{1,2} | awk 'BEGIN { count=0; } NR>1 && $3 == 0 { count++ } END { print count }') -eq 0 ]]
3434 '';
35− someContentIsShared = loc: ''[[ $(btrfs fi du -s --raw ${lib.escapeShellArg loc}/dedup-me-{1,2} | awk 'BEGIN { count=0; } NR>1 && $3 == 0 { count++ } END { print count }') -eq 0 ]]'';
3635 in ''
3736 # shut down the instance started by systemd at boot, so we can test our test procedure
38− $machine->succeed("systemctl stop beesd\@aux1.service");
37+ machine.succeed("systemctl stop beesd@aux1.service")
3938
40− $machine->succeed("dd if=/dev/urandom of=/aux1/dedup-me-1 bs=1M count=8");
41− $machine->succeed("cp --reflink=never /aux1/dedup-me-1 /aux1/dedup-me-2");
42− $machine->succeed("cp --reflink=never /aux1/* /aux2/");
43− $machine->succeed("sync");
44− $machine->fail(q(${someContentIsShared "/aux1"}));
45− $machine->fail(q(${someContentIsShared "/aux2"}));
46− $machine->succeed("systemctl start beesd\@aux1.service");
39+ machine.succeed(
40+ "dd if=/dev/urandom of=/aux1/dedup-me-1 bs=1M count=8",
41+ "cp --reflink=never /aux1/dedup-me-1 /aux1/dedup-me-2",
42+ "cp --reflink=never /aux1/* /aux2/",
43+ "sync",
44+ )
45+ machine.fail(
46+ "${someContentIsShared "/aux1"}",
47+ "${someContentIsShared "/aux2"}",
48+ )
49+ machine.succeed("systemctl start beesd@aux1.service")
4750
4851 # assert that "Set Shared" column is nonzero
49− $machine->succeed(q(${withRetry (someContentIsShared "/aux1") 20 2}));
50− $machine->fail(q(${someContentIsShared "/aux2"}));
52+ machine.wait_until_succeeds(
53+ "${someContentIsShared "/aux1"}",
54+ )
55+ machine.fail("${someContentIsShared "/aux2"}")
5156
5257 # assert that 16MB hash table size requested was honored
53− $machine->succeed(q([[ $(stat -c %s /aux1/.beeshome/beeshash.dat) = $(( 16 * 1024 * 1024)) ]]))
58+ machine.succeed(
59+ "[[ $(stat -c %s /aux1/.beeshome/beeshash.dat) = $(( 16 * 1024 * 1024)) ]]"
60+ )
5461 '';
5562})