Skip to content

Commit c21fe3b

Browse files
committed
improved debug output of tests for travis
1 parent de9e3c0 commit c21fe3b

File tree

1 file changed

+22
-7
lines changed

1 file changed

+22
-7
lines changed

tests/lib/prove.py

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
# IMPORT
3030
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3131

32+
import base64
3233
import os
34+
import zlib
3335

3436
from .const import (
3537
TEST_FS_LOGGEDFS,
@@ -65,17 +67,24 @@ def prove(self, test_path):
6567
append_to_file(self.fstest_log_abs_path, test_path + '\n')
6668

6769
status, out, err = self.__run_fstest__(test_path)
68-
len_expected, len_passed, len_passed_todo, len_failed, len_failed_todo, res_dict = self.__process_raw_results__(out)
70+
(
71+
len_expected,
72+
len_passed,
73+
len_passed_todo,
74+
len_failed,
75+
len_failed_todo,
76+
res_dict
77+
) = self.__process_raw_results__(out)
6978

7079
grp_dir, grp_nr = self.__get_group_id_from_path__(test_path)
7180
grp_code = read_file(test_path)
7281
grp_log = read_file(self.loggedfs_log_abs_path)
7382

7483
pass_condition = all([
75-
len_failed == 0,
76-
len_expected == (len_passed + len_passed_todo + len_failed + len_failed_todo),
77-
len_expected != 0,
78-
'Traceback (most recent call last)' not in grp_log
84+
len_failed == 0, # ASSERT BELOW!
85+
len_expected == (len_passed + len_passed_todo + len_failed + len_failed_todo), # ASSERT BELOW!
86+
len_expected != 0, # ASSERT BELOW!
87+
'Traceback (most recent call last)' not in grp_log # ASSERT BELOW!
7988
])
8089
# pass_condition_err = err.strip() == ''
8190

@@ -110,11 +119,17 @@ def prove(self, test_path):
110119
write_file(os.path.join(self.logs_abs_path, report_fn), report_str)
111120

112121
print('=== %s ===' % report_fn)
113-
print(report_str)
122+
print('len_expected = {:d}\nlen_passed = {:d}\nlen_passed_todo = {:d}\nlen_failed = {:d}\nlen_failed_todo = {:d}'.format(
123+
len_expected, len_passed, len_passed_todo, len_failed, len_failed_todo
124+
))
125+
print(base64.encodebytes(zlib.compress(report_str.encode('utf-8'), 7)).decode('utf-8')) # compress level 7 (high)
114126

115127
self.__clear_loggedfs_log__()
116128

117-
assert pass_condition
129+
assert len_failed == 0 # ASSERT ABOVE!
130+
assert len_expected == (len_passed + len_passed_todo + len_failed + len_failed_todo) # ASSERT ABOVE!
131+
assert len_expected != 0 # ASSERT ABOVE!
132+
assert 'Traceback (most recent call last)' not in grp_log # ASSERT ABOVE!
118133

119134

120135
def __clear_loggedfs_log__(self):

0 commit comments

Comments
 (0)