From: Vincent Fu <vincent.fu@xxxxxxxxxxx>
Sometimes error/informational messages appear at the end of the JSON
data. Try to parse as JSON only the text between the first { and the
last }.
Signed-off-by: Vincent Fu <vincent.fu@xxxxxxxxxxx>
---
t/fiotestlib.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/t/fiotestlib.py b/t/fiotestlib.py
index 61adca14..916dc17f 100755
--- a/t/fiotestlib.py
+++ b/t/fiotestlib.py
@@ -260,12 +260,13 @@ class FioJobFileTest(FioExeTest):
return
#
- # Sometimes fio informational messages are included at the top of the
- # JSON output, especially under Windows. Try to decode output as JSON
- # data, skipping everything until the first {
+ # Sometimes fio informational messages are included outside the JSON
+ # output, especially under Windows. Try to decode output as JSON data,
+ # skipping outside the first { and last }
#
lines = file_data.splitlines()
- file_data = '\n'.join(lines[lines.index("{"):])
+ last = len(lines) - lines[::-1].index("}")
+ file_data = '\n'.join(lines[lines.index("{"):last])
try:
self.json_data = json.loads(file_data)
except json.JSONDecodeError:
@@ -320,12 +321,13 @@ class FioJobCmdTest(FioExeTest):
file_data = file.read()
#
- # Sometimes fio informational messages are included at the top of the
- # JSON output, especially under Windows. Try to decode output as JSON
- # data, skipping everything until the first {
+ # Sometimes fio informational messages are included outside the JSON
+ # output, especially under Windows. Try to decode output as JSON data,
+ # skipping outside the first { and last }
#
lines = file_data.splitlines()
- file_data = '\n'.join(lines[lines.index("{"):])
+ last = len(lines) - lines[::-1].index("}")
+ file_data = '\n'.join(lines[lines.index("{"):last])
try:
self.json_data = json.loads(file_data)
except json.JSONDecodeError:
--
2.25.1
