Fix quteprocess tests with Python 3.6 on Windows

Values smaller than 86400 would result in a negative unsupported timestamp and
thus throw ValueError in Python 3.6
This commit is contained in:
Florian Bruhin 2017-03-28 20:53:11 +02:00
parent 5d9cd98c0f
commit 93a12797aa

View File

@ -149,11 +149,11 @@ def test_quteprocess_quitting(qtbot, quteproc_process):
@pytest.mark.parametrize('data, attrs', [ @pytest.mark.parametrize('data, attrs', [
( (
# Normal message # Normal message
'{"created": 0, "msecs": 0, "levelname": "DEBUG", "name": "init", ' '{"created": 86400, "msecs": 0, "levelname": "DEBUG", "name": "init", '
'"module": "earlyinit", "funcName": "init_log", "lineno": 280, ' '"module": "earlyinit", "funcName": "init_log", "lineno": 280, '
'"levelno": 10, "message": "Log initialized."}', '"levelno": 10, "message": "Log initialized."}',
{ {
'timestamp': datetime.datetime.fromtimestamp(0), 'timestamp': datetime.datetime.fromtimestamp(86400),
'loglevel': logging.DEBUG, 'loglevel': logging.DEBUG,
'category': 'init', 'category': 'init',
'module': 'earlyinit', 'module': 'earlyinit',
@ -165,28 +165,28 @@ def test_quteprocess_quitting(qtbot, quteproc_process):
), ),
( (
# VDEBUG # VDEBUG
'{"created": 0, "msecs": 0, "levelname": "VDEBUG", "name": "foo", ' '{"created": 86400, "msecs": 0, "levelname": "VDEBUG", "name": "foo", '
'"module": "foo", "funcName": "foo", "lineno": 0, "levelno": 9, ' '"module": "foo", "funcName": "foo", "lineno": 0, "levelno": 9, '
'"message": ""}', '"message": ""}',
{'loglevel': log.VDEBUG_LEVEL} {'loglevel': log.VDEBUG_LEVEL}
), ),
( (
# Unknown module # Unknown module
'{"created": 0, "msecs": 0, "levelname": "DEBUG", "name": "qt", ' '{"created": 86400, "msecs": 0, "levelname": "DEBUG", "name": "qt", '
'"module": null, "funcName": null, "lineno": 0, "levelno": 10, ' '"module": null, "funcName": null, "lineno": 0, "levelno": 10, '
'"message": "test"}', '"message": "test"}',
{'module': None, 'function': None, 'line': None}, {'module': None, 'function': None, 'line': None},
), ),
( (
# Expected message # Expected message
'{"created": 0, "msecs": 0, "levelname": "VDEBUG", "name": "foo", ' '{"created": 86400, "msecs": 0, "levelname": "VDEBUG", "name": "foo", '
'"module": "foo", "funcName": "foo", "lineno": 0, "levelno": 9, ' '"module": "foo", "funcName": "foo", "lineno": 0, "levelno": 9, '
'"message": "SpellCheck: test"}', '"message": "SpellCheck: test"}',
{'expected': True}, {'expected': True},
), ),
( (
# Weird Qt location # Weird Qt location
'{"created": 0, "msecs": 0, "levelname": "DEBUG", "name": "qt", ' '{"created": 86400, "msecs": 0, "levelname": "DEBUG", "name": "qt", '
'"module": "qnetworkreplyhttpimpl", "funcName": ' '"module": "qnetworkreplyhttpimpl", "funcName": '
'"void QNetworkReplyHttpImplPrivate::error(' '"void QNetworkReplyHttpImplPrivate::error('
'QNetworkReply::NetworkError, const QString&)", "lineno": 1929, ' 'QNetworkReply::NetworkError, const QString&)", "lineno": 1929, '
@ -200,7 +200,7 @@ def test_quteprocess_quitting(qtbot, quteproc_process):
} }
), ),
( (
'{"created": 0, "msecs": 0, "levelname": "DEBUG", "name": "qt", ' '{"created": 86400, "msecs": 0, "levelname": "DEBUG", "name": "qt", '
'"module": "qxcbxsettings", "funcName": "QXcbXSettings::QXcbXSettings(' '"module": "qxcbxsettings", "funcName": "QXcbXSettings::QXcbXSettings('
'QXcbScreen*)", "lineno": 233, "levelno": 10, "message": ' 'QXcbScreen*)", "lineno": 233, "levelno": 10, "message": '
'"QXcbXSettings::QXcbXSettings(QXcbScreen*) Failed to get selection ' '"QXcbXSettings::QXcbXSettings(QXcbScreen*) Failed to get selection '
@ -213,7 +213,7 @@ def test_quteprocess_quitting(qtbot, quteproc_process):
), ),
( (
# ResourceWarning # ResourceWarning
'{"created": 0, "msecs": 0, "levelname": "WARNING", ' '{"created": 86400, "msecs": 0, "levelname": "WARNING", '
'"name": "py.warnings", "module": "app", "funcName": "qt_mainloop", ' '"name": "py.warnings", "module": "app", "funcName": "qt_mainloop", '
'"lineno": 121, "levelno": 30, "message": ' '"lineno": 121, "levelno": 30, "message": '
'".../app.py:121: ResourceWarning: unclosed file <_io.TextIOWrapper ' '".../app.py:121: ResourceWarning: unclosed file <_io.TextIOWrapper '
@ -231,7 +231,7 @@ def test_log_line_parse(data, attrs):
@pytest.mark.parametrize('data, colorized, expect_error, expected', [ @pytest.mark.parametrize('data, colorized, expect_error, expected', [
( (
{'created': 0, 'msecs': 0, 'levelname': 'DEBUG', 'name': 'foo', {'created': 86400, 'msecs': 0, 'levelname': 'DEBUG', 'name': 'foo',
'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 10, 'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 10,
'message': 'quux'}, 'message': 'quux'},
False, False, False, False,
@ -239,7 +239,7 @@ def test_log_line_parse(data, attrs):
), ),
# Traceback attached # Traceback attached
( (
{'created': 0, 'msecs': 0, 'levelname': 'DEBUG', 'name': 'foo', {'created': 86400, 'msecs': 0, 'levelname': 'DEBUG', 'name': 'foo',
'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 10, 'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 10,
'message': 'quux', 'traceback': 'Traceback (most recent call ' 'message': 'quux', 'traceback': 'Traceback (most recent call '
'last):\n here be dragons'}, 'last):\n here be dragons'},
@ -250,7 +250,7 @@ def test_log_line_parse(data, attrs):
), ),
# Colorized # Colorized
( (
{'created': 0, 'msecs': 0, 'levelname': 'DEBUG', 'name': 'foo', {'created': 86400, 'msecs': 0, 'levelname': 'DEBUG', 'name': 'foo',
'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 10, 'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 10,
'message': 'quux'}, 'message': 'quux'},
True, False, True, False,
@ -259,7 +259,7 @@ def test_log_line_parse(data, attrs):
), ),
# Expected error # Expected error
( (
{'created': 0, 'msecs': 0, 'levelname': 'ERROR', 'name': 'foo', {'created': 86400, 'msecs': 0, 'levelname': 'ERROR', 'name': 'foo',
'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 40, 'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 40,
'message': 'quux'}, 'message': 'quux'},
False, True, False, True,
@ -267,7 +267,7 @@ def test_log_line_parse(data, attrs):
), ),
# Expected other message (i.e. should make no difference) # Expected other message (i.e. should make no difference)
( (
{'created': 0, 'msecs': 0, 'levelname': 'DEBUG', 'name': 'foo', {'created': 86400, 'msecs': 0, 'levelname': 'DEBUG', 'name': 'foo',
'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 10, 'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 10,
'message': 'quux'}, 'message': 'quux'},
False, True, False, True,
@ -275,7 +275,7 @@ def test_log_line_parse(data, attrs):
), ),
# Expected error colorized (shouldn't be red) # Expected error colorized (shouldn't be red)
( (
{'created': 0, 'msecs': 0, 'levelname': 'ERROR', 'name': 'foo', {'created': 86400, 'msecs': 0, 'levelname': 'ERROR', 'name': 'foo',
'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 40, 'module': 'bar', 'funcName': 'qux', 'lineno': 10, 'levelno': 40,
'message': 'quux'}, 'message': 'quux'},
True, True, True, True,