python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-21 00:19:42 +02:00
Code Issues Releases Activity

fix for no data

Browse Source
This commit is contained in:
Kelly Brazil
2020-06-10 17:27:46 -07:00
parent 0bf9a7a072
commit 525aec1a02
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -6,6 +6,7 @@ jc changelog
- Update blkid parser to fix error on parsing empty data - Update blkid parser to fix error on parsing empty data
- Update crontab parser to fix error on parsing empty data - Update crontab parser to fix error on parsing empty data
- Update crontab_u parser to fix error on parsing empty data - Update crontab_u parser to fix error on parsing empty data
- Update df parser to fix error on parsing empty data
- Add tests to all parsers for no data condition - Add tests to all parsers for no data condition
20200610 v1.11.4 20200610 v1.11.4

16
jc/parsers/df.py
View File

@ -73,7 +73,7 @@ import jc.parsers.universal
class info(): class info():
version = '1.3' version = '1.4'
description = 'df command parser' description = 'df command parser'
author = 'Kelly Brazil' author = 'Kelly Brazil'
author_email = 'kellyjonbrazil@gmail.com' author_email = 'kellyjonbrazil@gmail.com'
@ -184,14 +184,16 @@ def parse(data, raw=False, quiet=False):
jc.utils.compatibility(__name__, info.compatible) jc.utils.compatibility(__name__, info.compatible)
cleandata = data.splitlines() cleandata = data.splitlines()
raw_output = []
# fix headers if len(cleandata) > 1:
cleandata[0] = cleandata[0].lower() # fix headers
cleandata[0] = cleandata[0].replace('-', '_') cleandata[0] = cleandata[0].lower()
cleandata[0] = cleandata[0].replace('mounted on', 'mounted_on') cleandata[0] = cleandata[0].replace('-', '_')
cleandata[0] = cleandata[0].replace('mounted on', 'mounted_on')
# parse the data # parse the data
raw_output = jc.parsers.universal.sparse_table_parse(cleandata) raw_output = jc.parsers.universal.sparse_table_parse(cleandata)
if raw: if raw:
return raw_output return raw_output

6
tests/test_df.py
View File

@ -59,6 +59,12 @@ class MyTests(unittest.TestCase):
with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/df-h.json'), 'r', encoding='utf-8') as f: with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/df-h.json'), 'r', encoding='utf-8') as f:
self.osx_10_14_6_df_h_json = json.loads(f.read()) self.osx_10_14_6_df_h_json = json.loads(f.read())
def test_df_nodata(self):
"""
Test plain 'df' with no data
"""
self.assertEqual(jc.parsers.df.parse('', quiet=True), [])
def test_df_centos_7_7(self): def test_df_centos_7_7(self):
""" """
Test plain 'df' on Centos 7.7 Test plain 'df' on Centos 7.7