Skip to content

Commit c081356

Browse files
author
Dzmitry Humianiuk
authored
Merge pull request #129 from iivanou/doc_log_handler
Update an example of the python logging handler usage
2 parents f5bbbe0 + f5eeef8 commit c081356

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
stages:
22
- test
33
- name: deploy
4-
if: tag IS present
4+
if: tag IS present AND fork = false
55
language: python
66
python:
77
- "2.7"

README.rst

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,18 @@ in conftest.py:
9797
@pytest.fixture(scope="session")
9898
def rp_logger(request):
9999
import logging
100-
# Import Report Portal logger and handler to the test module.
101-
from pytest_reportportal import RPLogger, RPLogHandler
102-
# Setting up a logging.
103-
logging.setLoggerClass(RPLogger)
104100
logger = logging.getLogger(__name__)
105101
logger.setLevel(logging.DEBUG)
106-
# Create handler for Report Portal.
107-
rp_handler = RPLogHandler(request.node.config.py_test_service)
102+
# Create handler for Report Portal if the service has been
103+
# configured and started.
104+
if hasattr(request.node.config, 'py_test_service'):
105+
# Import Report Portal logger and handler to the test module.
106+
from pytest_reportportal import RPLogger, RPLogHandler
107+
logging.setLoggerClass(RPLogger)
108+
rp_handler = RPLogHandler(request.node.config.py_test_service)
109+
else:
110+
import sys
111+
rp_handler = logging.StreamHandler(sys.stdout)
108112
# Set INFO level for Report Portal handler.
109113
rp_handler.setLevel(logging.INFO)
110114
return logger

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ def read_file(fname):
88
return f.read()
99

1010

11-
version = '1.0.5'
12-
tar_url = 'https://github.com/reportportal/agent-python-pytest/tarball/1.0.3'
11+
version = '1.0.8'
1312

1413

1514
requirements = [
@@ -29,7 +28,6 @@ def read_file(fname):
2928
author='Pavel Papou',
3029
author_email='[email protected]',
3130
url='https://github.com/reportportal/agent-python-pytest',
32-
download_url=tar_url,
3331
packages=['pytest_reportportal'],
3432
install_requires=requirements,
3533
license='Apache 2.0',

0 commit comments

Comments
 (0)