From fb7e703654744ccc12f85c4ffc4d34e9add6104a Mon Sep 17 00:00:00 2001 From: Tony Asleson Date: Wed, 7 Jan 2026 17:26:07 -0600 Subject: [PATCH] [rename] blk-archive -> blk-slash Signed-off-by: Tony Asleson --- src/dmtest/blk_archive/common.py | 17 ++++++++++------- src/dmtest/blk_archive/rolling_snaps.py | 2 +- src/dmtest/blk_archive/unit.py | 2 +- test_dependencies.toml | 10 +++++----- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/dmtest/blk_archive/common.py b/src/dmtest/blk_archive/common.py index ba7a965..143333a 100644 --- a/src/dmtest/blk_archive/common.py +++ b/src/dmtest/blk_archive/common.py @@ -15,25 +15,28 @@ from dmtest.fs import Xfs from dmtest.thin.utils import standard_pool +# Environment variable to override the blk-archive/blk-stash binary name +BLK_ARCHIVE_BIN = os.getenv("BLK_ARCHIVE_BIN", "blk-stash") + class BlkArchive: def __init__(self, directory, block_size=4096): self.dir = os.path.abspath(directory) - process.run(f"blk-archive create -a {self.dir} --block-size {block_size}") + process.run(f"{BLK_ARCHIVE_BIN} create -a {self.dir} --block-size {block_size}") def pack(self, device_or_file): - stdout = process.run(f"blk-archive -j pack -a {self.dir} {device_or_file}")[1] + stdout = process.run(f"{BLK_ARCHIVE_BIN} pack -j -a {self.dir} {device_or_file}")[1] result = json.loads(stdout) return result["stream_id"] def unpack(self, stream, dest): - process.run(f"blk-archive -j unpack -a {self.dir} -s {stream} {dest}") + process.run(f"{BLK_ARCHIVE_BIN} unpack -j -a {self.dir} -s {stream} {dest}") def dump_stream(self, stream): - return process.run(f"blk-archive -j dump-stream -a {self.dir} -s {stream}") + return process.run(f"{BLK_ARCHIVE_BIN} dump-stream -j -a {self.dir} -s {stream}") def pack_delta(self, old, old_id, new): - stdout = process.run(f"blk-archive -j pack -a {self.dir} {new} --delta-stream {old_id} --delta-device {old}")[1] + stdout = process.run(f"{BLK_ARCHIVE_BIN} pack -j -a {self.dir} {new} --delta-stream {old_id} --delta-device {old}")[1] result = json.loads(stdout) return result["stream_id"] @@ -42,7 +45,7 @@ def verify(self, dev_or_file, stream=None): if stream is None: stream = self.get_stream_id(dev_or_file) process.run( - f"blk-archive verify -a {self.dir} --stream {stream} {dev_or_file}" + f"{BLK_ARCHIVE_BIN} verify -a {self.dir} --stream {stream} {dev_or_file}" ) def get_stream_id(self, dev_or_file): @@ -50,7 +53,7 @@ def get_stream_id(self, dev_or_file): name = os.path.basename(dev_or_file) else: name = os.path.basename(dev_or_file.path) - (code, stdout, stderr) = process.run(f"blk-archive -j list -a {self.dir}") + (code, stdout, stderr) = process.run(f"{BLK_ARCHIVE_BIN} list -j -a {self.dir}") result = json.loads(stdout) item = next((i for i in result if i["source"] == name), None) diff --git a/src/dmtest/blk_archive/rolling_snaps.py b/src/dmtest/blk_archive/rolling_snaps.py index 1cf323c..6277625 100644 --- a/src/dmtest/blk_archive/rolling_snaps.py +++ b/src/dmtest/blk_archive/rolling_snaps.py @@ -75,7 +75,7 @@ def t_rolling_snaps(fix): def register(tests): tests.register_batch( - "/blk-archive/", + "/blk-stash/", [ ("rolling-snaps", t_rolling_snaps, reg.check_linux_repo), ], diff --git a/src/dmtest/blk_archive/unit.py b/src/dmtest/blk_archive/unit.py index 184ffb7..1330f3d 100644 --- a/src/dmtest/blk_archive/unit.py +++ b/src/dmtest/blk_archive/unit.py @@ -47,7 +47,7 @@ def t_src_dest_combinations(fix): def register(tests): tests.register_batch( - "/blk-archive/unit", + "/blk-stash/unit", [ ("combinations", t_src_dest_combinations), ], diff --git a/test_dependencies.toml b/test_dependencies.toml index 6803812..67c952d 100644 --- a/test_dependencies.toml +++ b/test_dependencies.toml @@ -210,16 +210,16 @@ targets = [ "linear", "thin", "thin-pool",] executables = [ "blockdev", "dd", "dmsetup", "thin_check",] targets = [ "linear", "thin", "thin-pool",] -["/blk-archive/rolling-snaps"] -executables = [ "blk-archive", "blockdev", "dd", "dmsetup", "echo", "fsck.ext4", "git", "mkfs.ext4", "mount", "rm", "umount",] +["/blk-stash/rolling-snaps"] +executables = [ "blk-stash", "blockdev", "dd", "dmsetup", "echo", "fsck.ext4", "git", "mkfs.ext4", "mount", "rm", "umount",] targets = [ "thin", "thin-pool",] -["/blk-archive/unit/hello"] +["/blk-stash/unit/hello"] executables = [ "blockdev", "dd", "dmsetup",] targets = [ "thin", "thin-pool",] -["/blk-archive/unit/combinations"] -executables = [ "blk-archive", "blockdev", "cmp", "dd", "dmsetup", "echo", "losetup", "mkfs.xfs", "mount", "umount", "xfs_repair",] +["/blk-stash/unit/combinations"] +executables = [ "blk-stash", "blockdev", "cmp", "dd", "dmsetup", "echo", "losetup", "mkfs.xfs", "mount", "umount", "xfs_repair",] targets = [ "linear", "thin", "thin-pool",] ["/thin/fs-bench/fio/thick"]