From: Simon Glass <sjg@chromium.org>
Date: Mon, 8 Jul 2019 19:18:42 +0000 (-0600)
Subject: binman: Use the tools.Decompress method
X-Git-Tag: v2019.10-rc1~14^2~55
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ff5c7e383e8c053684fff263dd0afc7aeb8040fb;p=oweals%2Fu-boot.git

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

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"""