openstack
/
cinderlib
Code Issues Proposed changes

tests: Support older versions of lsblk 

Our functional tests use lsblk to get the size of a device, and we were
using the JSON output that is available on v2.28.2.

With this patch we change how we use lsblk and stop requesting JSON
output and read normal output.  Making us able to use older version of
lsblk.

Tested with lsblk version 2.23.2
This commit is contained in:
Gorka Eguileor 2018-06-20 17:57:07 +02:00
parent d60078f21c
commit 6ef8ec9a10
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/functional/base_tests.py
View File

@ -170,10 +170,9 @@ class BaseFunctTestCase(unittest2.TestCase):
try:
while True:
try:
result = self._root_execute('lsblk', '-o', 'SIZE', '-J',
result = self._root_execute('lsblk', '-o', 'SIZE',
'-b', vol.local_attach.path)
data = json.loads(result)
size_bytes = data['blockdevices'][0]['size']
size_bytes = result.split()[1]
return float(size_bytes) / 1024.0 / 1024.0 / 1024.0
# NOTE(geguileo): We can't catch subprocess.CalledProcessError
# because somehow we get an instance from a different