From ff5c7e383e8c053684fff263dd0afc7aeb8040fb Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Mon, 8 Jul 2019 13:18:42 -0600
Subject: [PATCH] binman: Use the tools.Decompress method
Update the compression test to use the tools module to decompress the
output data.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
tools/binman/ftest.py | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index c74e12d13c..6ff871b3c1 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -59,7 +59,7 @@ BMPBLK_DATA = b'bmp'
VBLOCK_DATA = b'vblk'
FILES_DATA = (b"sorry I'm late\nOh, don't bother apologising, I'm " +
b"sorry you're alive\n")
-COMPRESS_DATA = b'data to compress'
+COMPRESS_DATA = b'compress xxxxxxxxxxxxxxxxxxxxxx data'
REFCODE_DATA = b'refcode'
@@ -1560,16 +1560,7 @@ class TestFunctional(unittest.TestCase):
self._ResetDtbs()
def _decompress(self, data):
- out = os.path.join(self._indir, 'lz4.tmp')
- with open(out, 'wb') as fd:
- fd.write(data)
- return tools.Run('lz4', '-dc', out, binary=True)
- '''
- try:
- orig = lz4.frame.decompress(data)
- except AttributeError:
- orig = lz4.decompress(data)
- '''
+ return tools.Decompress(data, 'lz4')
def testCompress(self):
"""Test compression of blobs"""
--
2.39.5