Skip to content

Commit d219243

Browse files
authored
Merge pull request #395 from reportportal/develop
Release
2 parents fe55fc2 + 1f12fff commit d219243

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ jobs:
108108
version: ${{ env.RELEASE_VERSION }}
109109
path: ./${{ env.CHANGE_LOG_FILE }}
110110

111-
- name: Create Release
112-
id: createRelease
113-
uses: ncipollo/release-action@v1
114-
with:
115-
tag: ${{ env.RELEASE_VERSION }}
116-
name: Release ${{ env.RELEASE_VERSION }}
117-
body: ${{ steps.readChangelogEntry.outputs.changes }}
111+
# - name: Create Release
112+
# id: createRelease
113+
# uses: ncipollo/release-action@v1
114+
# with:
115+
# tag: ${{ env.RELEASE_VERSION }}
116+
# name: Release ${{ env.RELEASE_VERSION }}
117+
# body: ${{ steps.readChangelogEntry.outputs.changes }}
118118

119119
- name: Update version file
120120
id: versionFileUpdate

tests/integration/test_pytest_parallel.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from unittest import mock
1717

1818
import pytest
19-
from delayed_assert import assert_expectations, expect
2019

2120
from tests import REPORT_PORTAL_SERVICE
2221
from tests.helpers import utils
@@ -38,12 +37,10 @@ def test_pytest_parallel_threads(mock_client_init):
3837

3938
mock_client = mock_client_init.return_value
4039

41-
expect(mock_client.start_launch.call_count == 1, '"start_launch" method was not called')
42-
expect(mock_client.finish_launch.call_count == 1, '"finish_launch" method was not called')
43-
assert_expectations()
40+
assert mock_client.start_launch.call_count == 1, '"start_launch" method was not called'
41+
assert mock_client.finish_launch.call_count == 1, '"finish_launch" method was not called'
4442

4543
finish_args = mock_client.finish_launch.call_args_list
46-
expect(finish_args[0][1]["status"] in ("PASSED", None), "Launch failed")
44+
assert finish_args[0][1]["status"] in ("PASSED", None), "Launch failed"
4745
launch_end_time = finish_args[0][1]["end_time"]
48-
expect(launch_end_time is not None and int(launch_end_time) > 0, "Launch end time is empty")
49-
assert_expectations()
46+
assert launch_end_time is not None and int(launch_end_time) > 0, "Launch end time is empty"

0 commit comments

Comments
 (0)