Skip to content

Commit c8880b5

Browse files
authored
Merge pull request #43 from pywin32/xoviat-patch-1
Tests: FIXUP wrapper script.
2 parents cb4f5a7 + 284d146 commit c8880b5

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

tests/scripts/appveyor/fixup_wrapper.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@
1010

1111
wrapper_file.seek(pos)
1212

13-
wrapper = json.loads(wrapper_file.read())
13+
wrapper = json.load(wrapper_file)
1414

1515
for i, item in enumerate(wrapper['captures']):
16-
wrapper['captures'][i]['stdout'] = wrapper['captures'][0]['stdout']
17-
wrapper['captures'][i]['stderr'] = wrapper['captures'][0]['stderr']
16+
wrapper['captures'][i].setdefault('stdout', '')
17+
wrapper['captures'][i].setdefault('stderr', '')
18+
if not wrapper['captures'][i]['stdout']:
19+
wrapper['captures'][i]['stdout'] = wrapper['captures'][0]['stdout']
20+
if not wrapper['captures'][i]['stderr']:
21+
wrapper['captures'][i]['stderr'] = wrapper['captures'][0]['stderr']
1822

1923
wrapper_file.seek(0)
2024
wrapper_file.truncate()
21-
wrapper_file.write(json.dumps(wrapper))
25+
json.dump(wrapper, wrapper_file, indent=4)

0 commit comments

Comments
 (0)