Update pytest version (#29)

Author: gvachkov

test-requirements.txt

@@ -5,7 +5,7 @@ Flask
 sanic; python_version >= '3.5'
 aiohttp; python_version >= '3.5'
 sonic182-json-validator==0.0.12
-pytest==3.2.2
+pytest==3.6.2
 pytest-cov==2.5.1
 pytest-mock==1.6.3
 pylint

tests/test_falcon_logging.py

@@ -13,7 +13,6 @@
 )
 from tests.util import (
     check_log_record,
-    config_root_logger,
     enable_sensitive_fields_logging,
     config_logger
 )
@@ -79,7 +78,7 @@ def test_falcon_request_logs_user(user):
 
 
 def _check_falcon_request_log(app, headers, expected):
-    _, stream = config_root_logger('cf.falcon.logger')
+    _, stream = config_logger('cf.falcon.logger')
 
     client = testing.TestClient(app)
     _check_expected_response(

tests/test_flask_logging.py

@@ -10,7 +10,7 @@
 from tests.util import (
     check_log_record,
     enable_sensitive_fields_logging,
-    config_root_logger,
+    config_logger,
 )
 
 
@@ -47,7 +47,7 @@ def _root():
         return Response('ok', mimetype='text/plain')
 
     _set_up_flask_logging(app)
-    _, stream = config_root_logger('cf.flask.logger')
+    _, stream = config_logger('cf.flask.logger')
 
     client = app.test_client()
     _check_expected_response(client.get('/test/path', headers=headers))
@@ -77,7 +77,7 @@ def _user_logging(headers, extra, expected):
 
     @app.route('/test/user/logging')
     def _logging_correlation_id_route():
-        logger, stream = config_root_logger('user.logging')
+        logger, stream = config_logger('user.logging')
         logger.info('in route headers', extra=extra)
         assert check_log_record(stream, JOB_LOG_SCHEMA, expected) == {}
         return Response('ok')

tests/test_job_logging.py

@@ -8,7 +8,7 @@
 from json_validator.validator import JsonValidator
 from sap import cf_logging
 from tests.log_schemas import JOB_LOG_SCHEMA
-from tests.util import config_root_logger
+from tests.util import config_logger
 
 # pylint: disable=protected-access
 
@@ -22,7 +22,7 @@ def before_each():
 def test_log_in_expected_format():
     """ Test the cf_logger as a standalone """
     cf_logging.init(level=logging.DEBUG)
-    logger, stream = config_root_logger('cli.test')
+    logger, stream = config_logger('cli.test')
     logger.info('hi')
     log_json = JSONDecoder().decode(stream.getvalue())
     _, error = JsonValidator(JOB_LOG_SCHEMA).validate(log_json)
@@ -36,7 +36,7 @@ def test_set_correlation_id():
     cf_logging.init(level=logging.DEBUG)
     cf_logging.FRAMEWORK.context.set_correlation_id(correlation_id)
 
-    logger, stream = config_root_logger('cli.test')
+    logger, stream = config_logger('cli.test')
     logger.info('hi')
 
     log_json = JSONDecoder().decode(stream.getvalue())
@@ -50,7 +50,7 @@ def test_set_correlation_id():
 def test_exception_stacktrace():
     """ Test exception stacktrace is logged """
     cf_logging.init(level=logging.DEBUG)
-    logger, stream = config_root_logger('cli.test')
+    logger, stream = config_logger('cli.test')
 
     try:
         return 1 / 0

tests/util.py

@@ -25,14 +25,6 @@ def check_log_record(stream, schema, expected):
     return error
 
 
-def config_root_logger(logger_name):
-    """ Function to configure a JSONLogger and print the output into a stream"""
-    stream = io.StringIO()
-    logging.getLogger().handlers[0].stream = stream
-    logger = logging.getLogger(logger_name)
-    return logger, stream
-
-
 def config_logger(logger_name):
     """ Function to configure a JSONLogger and print the output into a stream"""
     stream = io.StringIO()