diff mbox series

[v2,1/2] binman: Renumber the fake blob dts

Message ID 20220112201036.300649-1-sjg@chromium.org
State Accepted
Commit 32d4f106bd806428d756398a83d2b15563b58cf8
Delegated to: Tom Rini
Headers show
Series [v2,1/2] binman: Renumber the fake blob dts | expand

Commit Message

Simon Glass Jan. 12, 2022, 8:10 p.m. UTC 
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 <sjg@chromium.org>
---

Changes in v2:
- Add new patch to renumber the fake blob dts

 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%)

Comments

Tom Rini Jan. 13, 2022, 12:53 p.m. UTC | #1 
On Wed, Jan 12, 2022 at 01:10:35PM -0700, Simon Glass wrote:

> 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 <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index a9b7880f362..a9d9160967c 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