From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 29 Sep 2025 10:05:15 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1v38sl-002Law-28 for lore@lore.pengutronix.de; Mon, 29 Sep 2025 10:05:15 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1v38sj-0000h9-Sq for lore@pengutronix.de; Mon, 29 Sep 2025 10:05:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iW4MKvXJ9dbNuDHhwwhKWg+54+06yoH3XVIOAmfIAWc=; b=rJkVS3kgHZ5AGhcCU55/kMdPlW VrNELI6pEJ1MR+SWeKk5LCYCRkAv8UeQNQzU+lEwMDQKlS2JsAPE52hIGiurf0vwsVzsl+hqYX6Od T1cGC6sPkMw02k2cgEPPM7tl+5+eHBFIE1QQVaYl5hE4Egc6uu1hAjM0jpfR/b82LBrUP0Jm3gKcj OqgvUF3rsF/ooNy9DImz/p7IJVdqiW/f/jCQNBNBgyH55vxaNYZSvPYZLdx93opjwd/Zsptwn4ZqB Y54yuqF/oQCvMk79obCbYXzmSIQUOj8QKlvYHItt0pgVCKkxx5I95xo9UJ3upBKjKu7gJTryrK4aI F84/h+XA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1v38sE-00000001iMC-04Im; Mon, 29 Sep 2025 08:04:42 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1v38s9-00000001iGq-0mv5 for barebox@lists.infradead.org; Mon, 29 Sep 2025 08:04:39 +0000 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1v38s6-000070-9t; Mon, 29 Sep 2025 10:04:34 +0200 From: Jonas Rebmann Date: Mon, 29 Sep 2025 10:03:54 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250929-tlv-integration-v2-3-55f75da7e670@pengutronix.de> References: <20250929-tlv-integration-v2-0-55f75da7e670@pengutronix.de> In-Reply-To: <20250929-tlv-integration-v2-0-55f75da7e670@pengutronix.de> To: Sascha Hauer , BAREBOX Cc: Tobias Waldekranz , Jonas Rebmann X-Mailer: b4 0.15-dev-7abec X-Developer-Signature: v=1; a=openpgp-sha256; l=4028; i=jre@pengutronix.de; h=from:subject:message-id; bh=nLYSLHsiSuIwpReoelgp9RYi0rkG7/coUJZI9j+A3v4=; b=owGbwMvMwCV2ZcYT3onnbjcwnlZLYsi4Zdt3sGhBRFnr5v+zZy09tPXI739nTIMUpIJLXi5/5 pmWzsp2vKOUhUGMi0FWTJElVk1OQcjY/7pZpV0szBxWJpAhDFycAjARpTeMDHMXP/m17jD7fKcY ZnbdWRPX5L8IbTX9+9m1+40C44TjNyMYGe4cat/OYeb+/t8EZ7s9nWIRWrLmXzPu+VRUX3CW/uG xgwcA X-Developer-Key: i=jre@pengutronix.de; a=openpgp; fpr=0B7B750D5D3CD21B3B130DE8B61515E135CD49B5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250929_010437_232532_15DF0AC7 X-CRM114-Status: GOOD ( 10.64 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.4 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 3/9] test: move dm-verity testdata generation to fixture X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Simplify barebox integration test setup by moving logic away from scripts/ and .github/. Instead of generating testdata in separate scripts, they should be implemented as testfs fixtures which are automatically ran as part of the test suite. Includes error handling and cleanup. Signed-off-by: Jonas Rebmann --- scripts/generate_testfs.sh | 44 ----------------------------------- test/py/test_dm.py | 57 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 46 deletions(-) diff --git a/scripts/generate_testfs.sh b/scripts/generate_testfs.sh index e0a4013e05..d52772e6bf 100755 --- a/scripts/generate_testfs.sh +++ b/scripts/generate_testfs.sh @@ -31,47 +31,3 @@ generate_fit() if [ -f .github/testfs/${KBUILD_DEFCONFIG}-gzipped.its ]; then generate_fit fi - -alias pad128k="dd if=/dev/zero bs=128k count=1 status=none" - -generate_dm_verity() -{ - work=$(mktemp -d) - cd ${work} - - # Create two dummy files; use lots of padding to make sure that - # when we alter the contents of 'english' in root-bad, 'latin' is - # still be readable, as their contents wont (a) share the same - # hash block and (b) the block cache layer won't accedentally read - # the invalid block. - - pad128k >latin - echo -n "veritas vos liberabit" >>latin - pad128k >>latin - - pad128k >english - echo -n "truth will set you free" >>english - pad128k >>english - - truncate -s 1M good.fat - mkfs.vfat good.fat - mcopy -i good.fat latin english :: - - veritysetup format \ - --root-hash-file=good.hash \ - good.fat good.verity - - sed 's/truth will set you free/LIAR LIAR PANTS ON FIRE/' \ - bad.fat - - cd - - cp \ - ${work}/good.fat \ - ${work}/good.verity \ - ${work}/good.hash \ - ${work}/bad.fat \ - ${KBUILD_OUTPUT}/testfs - - rm -rf ${work} -} -generate_dm_verity diff --git a/test/py/test_dm.py b/test/py/test_dm.py index 8bdacf7b4e..adeb9cbe03 100644 --- a/test/py/test_dm.py +++ b/test/py/test_dm.py @@ -4,10 +4,63 @@ import re import pytest from .helper import of_get_property +import os, subprocess, shutil +def pad128k(f): + f.write(b"\0" * 128 * 1024) -def test_dm_verity(barebox, testfs): - barebox.run_check("cd /mnt/9p/testfs") +@pytest.fixture(scope="module") +def dm_testdata(testfs): + path = os.path.join(testfs, "dm") + os.makedirs(path, exist_ok=True) + cwd = os.getcwd() + os.chdir(path) + + with open("latin", "wb") as f: + pad128k(f) + f.write(b"veritas vos liberabit") + pad128k(f) + + with open("english", "wb") as f: + pad128k(f) + f.write(b"truth will set you free") + pad128k(f) + + try: + subprocess.run(["truncate", "-s", "1M", "good.fat"], check=True) + subprocess.run(["mkfs.vfat", "good.fat"], check=True) + subprocess.run(["mcopy", "-i", "good.fat", "latin", "english", "::"], check=True) + + subprocess.run([ + "veritysetup", "format", + "--root-hash-file=good.hash", + "good.fat", "good.verity" + ], check=True) + except FileNotFoundError as e: + os.chdir(cwd) + shutil.rmtree(path) + pytest.skip(f"missing dependency: {e}") + + with open("good.fat", "rb") as f: data = f.read() + with open("bad.fat", "wb") as f: + f.write(data.replace( + b"truth will set you free", + b"LIAR LIAR PANTS ON FIRE" + )) + + os.chdir(cwd) + + yield path + + shutil.rmtree(path) + +@pytest.fixture(autouse=True) +def reset_pwd(barebox): + yield + barebox.run("cd") + +def test_dm_verity(barebox, dm_testdata): + barebox.run_check("cd /mnt/9p/testfs/dm") # Since commands run in a subshell, export the root hash in a # global, so that we can access it from subsequent commands -- 2.51.0.297.gca2559c1d6