Skip to content

Commit 506adf0

Browse files
committed
Get rid of pytest-forked
It is not clean why this was neeed, but I believe it was because of the crashing test. Signed-off-by: Jakub Jelen <jjelen@redhat.com>
1 parent f666dae commit 506adf0

File tree

5 files changed

+0
-17
lines changed

5 files changed

+0
-17
lines changed

.github/workflows/ci-cd.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,15 +1101,6 @@ jobs:
11011101
&& '4.0.0-2'
11021102
|| '2.6.0-1'
11031103
}}${{ steps.distribution-meta.outputs.dist-tag }}.noarch.rpm
1104-
https://rpmfind.net/linux/epel/"$(
1105-
rpm --eval '%{rhel}'
1106-
)"/Everything/x86_64/Packages/p/python3-pytest-forked-${{
1107-
contains(matrix.target-container.tag, 'ubi9')
1108-
&& '1.4.0'
1109-
|| '1.0.2'
1110-
}}-1${{
1111-
steps.distribution-meta.outputs.dist-tag
1112-
}}.noarch.rpm
11131104
https://rpmfind.net/linux/epel/"$(
11141105
rpm --eval '%{rhel}'
11151106
)"/Everything/x86_64/Packages/p/python3-pytest-xdist-${{

packaging/rpm/ansible-pylibssh.spec

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ Source14: %{pypi_source typing_extensions 4.12.2}
5656
%endif
5757
Source15: %{pypi_source pytest 6.2.4}
5858
Source16: %{pypi_source pytest-cov 2.12.1}
59-
Source17: %{pypi_source pytest-forked 1.3.0}
6059
Source18: %{pypi_source pytest-xdist 2.3.0}
6160
Source19: %{pypi_source iniconfig 1.1.1}
6261
Source20: %{pypi_source attrs 20.3.0}
@@ -77,7 +76,6 @@ BuildRequires: openssh-clients
7776
%if 0%{?rhel}
7877
BuildRequires: python3dist(pytest)
7978
BuildRequires: python3dist(pytest-cov)
80-
BuildRequires: python3dist(pytest-forked)
8179
BuildRequires: python3dist(pytest-xdist)
8280
BuildRequires: python3dist(tox)
8381
%endif
@@ -166,8 +164,6 @@ PYTHONPATH="$(pwd)/bin" \
166164
PYTHONPATH="$(pwd)/bin" \
167165
%{__python3} -m pip install --no-deps -t bin %{SOURCE16}
168166
PYTHONPATH="$(pwd)/bin" \
169-
%{__python3} -m pip install --no-deps -t bin %{SOURCE17}
170-
PYTHONPATH="$(pwd)/bin" \
171167
%{__python3} -m pip install --no-deps -t bin %{SOURCE18}
172168
PYTHONPATH="$(pwd)/bin" \
173169
%{__python3} -m pip install --no-deps -t bin %{SOURCE19}

pytest.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ faulthandler_timeout = 30
4949
filterwarnings =
5050
error
5151
ignore:Coverage disabled via --no-cov switch!:pytest.PytestWarning:pytest_cov.plugin
52-
ignore:pytest-forked xfail support is incomplete at the moment and may output a misleading reason message:RuntimeWarning:pytest_forked
5352

5453
# FIXME: drop this once `pytest-cov` is updated.
5554
# Ref: https://github.com/pytest-dev/pytest-cov/issues/557

tests/unit/channel_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ def ssh_channel(ssh_client_session):
3333
chan.close()
3434

3535

36-
@pytest.mark.forked
3736
def exec_second_command(ssh_channel):
3837
"""Check the standard output of ``exec_command()`` as a string."""
3938
u_cmd = ssh_channel.exec_command('echo -n Hello Again')

tox.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ deps =
1818
coverage >= 5.3
1919
pytest
2020
pytest-cov
21-
pytest-forked
2221
pytest-xdist
2322
passenv =
2423
PYTHONPATH
@@ -44,7 +43,6 @@ deps =
4443
expandvars
4544
pytest
4645
pytest-cov
47-
pytest-forked
4846
pytest-xdist
4947
setenv =
5048
ANSIBLE_PYLIBSSH_CYTHON_TRACING = {env:ANSIBLE_PYLIBSSH_CYTHON_TRACING:1}

0 commit comments

Comments
 (0)