Skip to content

Commit 11de870

Browse files
authored
Merge pull request #146 from reportportal/develop
Release
2 parents fa71204 + 0be2783 commit 11de870

39 files changed

+496
-99
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
paths-ignore:
77
- '.github/**'
88
- CHANGELOG.md
9-
- README.rst
9+
- README.md
1010
- CONTRIBUTING.rst
1111

1212
env:
@@ -61,6 +61,12 @@ jobs:
6161
user: ${{ secrets.PYPI_USERNAME }}
6262
password: ${{ secrets.PYPI_PASSWORD }}
6363

64+
- name: Checkout develop branch
65+
uses: actions/checkout@v2
66+
with:
67+
ref: 'develop'
68+
fetch-depth: 0
69+
6470
- name: Update CHANGELOG.md
6571
id: changelogUpdate
6672
run: |

.github/workflows/tests.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
name: Tests
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- '*'
7+
- '!master'
8+
pull_request:
9+
branches:
10+
- 'master'
11+
- 'develop'
412

513
jobs:
614
build:

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Changelog
22

33
## [Unreleased]
4+
### Added
5+
- `RP_LOG_BATCH_PAYLOAD_SIZE` parameter, by @HardNorth
6+
### Changed
7+
- Client version updated on [5.2.3](https://github.com/reportportal/client-Python/releases/tag/5.2.3), by @HardNorth
8+
- The agent switched to use new client with async log processing, by @HardNorth
9+
10+
## [5.2.2]
411
### Fixed
512
- Issue [#140](https://github.com/reportportal/agent-Python-RobotFramework/issues/140) Process test message at the end of the test, by @iivanou
613
- Issue [#139](https://github.com/reportportal/agent-Python-RobotFramework/issues/139) Broken view in Before/After Suites items, by @HardNorth

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ NOT REQUIRED:
6464
- Space-separated list of tags/attributes for the tests
6565
--variable RP_LOG_BATCH_SIZE:"10"
6666
- Default value is "20", affects size of async batch log requests
67+
--variable RP_LOG_BATCH_PAYLOAD_SIZE:"10240000"
68+
- Default value is "65000000", maximum payload size of async batch log
69+
requests
6770
--variable RP_RERUN:"True"
6871
- Default is "False". Enables rerun mode for the last launch.
6972
--variable RP_RERUN_OF:"xxxxx-xxxx-xxxx-lauch-uuid"

examples/custom_test_case_id.robot

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
*** Test Cases ***
3+
Custom Test Case ID
4+
[Tags] test_case_id:custom
5+
Log Hello, world!

examples/simple.robot

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
*** Test Cases ***
3+
Simple test
4+
Log Hello, world!

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
python-dateutil>=2.8.1
2-
reportportal-client>=5.0.11
2+
reportportal-client>=5.2.3
33
robotframework
44
six>=1.15.0

robotframework_reportportal/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"""This package contains module for reporting to Report Portal.
22
3-
Copyright (c) 2021 http://reportportal.io .
3+
Copyright (c) 2021 https://reportportal.io .
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
66
You may obtain a copy of the License at
7-
http://www.apache.org/licenses/LICENSE-2.0
7+
https://www.apache.org/licenses/LICENSE-2.0
88
Unless required by applicable law or agreed to in writing, software
99
distributed under the License is distributed on an "AS IS" BASIS,
1010
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

robotframework_reportportal/exception.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"""This module includes exceptions used across the agent modules.
22
3-
Copyright (c) 2021 http://reportportal.io .
3+
Copyright (c) 2021 https://reportportal.io .
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
66
You may obtain a copy of the License at
7-
http://www.apache.org/licenses/LICENSE-2.0
7+
https://www.apache.org/licenses/LICENSE-2.0
88
Unless required by applicable law or agreed to in writing, software
99
distributed under the License is distributed on an "AS IS" BASIS,
1010
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

robotframework_reportportal/listener.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
See the License for the specific language governing permissions and
1212
limitations under the License.
1313
"""
14+
1415
import logging
1516
import os
1617
from mimetypes import guess_type
@@ -104,7 +105,8 @@ def service(self):
104105
log_batch_size=self.variables.log_batch_size,
105106
pool_size=self.variables.pool_size,
106107
skipped_issue=self.variables.skipped_issue,
107-
verify_ssl=self.variables.verify_ssl
108+
verify_ssl=self.variables.verify_ssl,
109+
log_batch_payload_size=self.variables.log_batch_payload_size
108110
)
109111
return self._service
110112

0 commit comments

Comments
 (0)