From 32d4f106bd806428d756398a83d2b15563b58cf8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 12 Jan 2022 13:10:35 -0700 Subject: [PATCH] binman: Renumber the fake blob dts Use a unique number instead of the current 203, which is used by 203_fip as well. Reformat the code to avoid a long line. Signed-off-by: Simon Glass --- tools/binman/ftest.py | 22 ++++++++++--------- .../{203_fake_blob.dts => 217_fake_blob.dts} | 0 2 files changed, 12 insertions(+), 10 deletions(-) rename tools/binman/test/{203_fake_blob.dts => 217_fake_blob.dts} (100%) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index a9b7880f36..a9d9160967 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -4667,16 +4667,6 @@ class TestFunctional(unittest.TestCase): str(e.exception), "Not enough space in '.*u_boot_binman_embed_sm' for data length.*") - def testFakeBlob(self): - """Test handling of faking an external blob""" - with test_util.capture_sys_output() as (stdout, stderr): - self._DoTestFile('203_fake_blob.dts', allow_missing=True, - allow_fake_blobs=True) - err = stderr.getvalue() - self.assertRegex(err, - "Image '.*' has faked external blobs and is non-functional: .*") - os.remove('binman_faking_test_blob') - def testVersion(self): """Test we can get the binman version""" version = '(unreleased)' @@ -4965,5 +4955,17 @@ fdt fdtmap Extract the devicetree blob from the fdtmap # There should be a U-Boot after the final FIP self.assertEqual(U_BOOT_DATA, data[-4:]) + def testFakeBlob(self): + """Test handling of faking an external blob""" + with test_util.capture_sys_output() as (stdout, stderr): + self._DoTestFile('217_fake_blob.dts', allow_missing=True, + allow_fake_blobs=True) + err = stderr.getvalue() + self.assertRegex( + err, + "Image '.*' has faked external blobs and is non-functional: .*") + os.remove('binman_faking_test_blob') + + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/203_fake_blob.dts b/tools/binman/test/217_fake_blob.dts similarity index 100% rename from tools/binman/test/203_fake_blob.dts rename to tools/binman/test/217_fake_blob.dts -- 2.39.5