commit 821f86e8392bc05579f7785e6907be6cc3844fef Merge: a62801f a011c93 Author: juga0 juga@riseup.net Date: Sat Nov 10 13:32:11 2018 +0000

Merge branch 'ticket28365'

CHANGELOG.md | 2 ++ sbws/lib/v3bwfile.py | 5 ++--- tests/unit/lib/test_v3bwfile.py | 11 +++++++++-- 3 files changed, 13 insertions(+), 5 deletions(-)

diff --cc tests/unit/lib/test_v3bwfile.py index fc544e5,30c92a3..a299d05 --- a/tests/unit/lib/test_v3bwfile.py +++ b/tests/unit/lib/test_v3bwfile.py @@@ -4,10 -4,11 +4,11 @@@ import jso import os.path

from sbws import __version__ as version - from sbws.globals import SPEC_VERSION, SBWS_SCALING, TORFLOW_SCALING + from sbws.globals import (SPEC_VERSION, SBWS_SCALING, TORFLOW_SCALING, + MIN_REPORT) from sbws.lib.resultdump import Result, load_result_file, ResultSuccess from sbws.lib.v3bwfile import (V3BWHeader, V3BWLine, TERMINATOR, LINE_SEP, - KEYVALUE_SEP_V110, num_results_of_type, + KEYVALUE_SEP_V1, num_results_of_type, V3BWFile) from sbws.util.timestamp import now_fname, now_isodt_str, now_unixts