Skip to content

tests: increase TIMEOUT_AWAIT_WRITE and update requests #3930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2021
Merged

tests: increase TIMEOUT_AWAIT_WRITE and update requests #3930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
149f95f
tests.mixins.stream_hls: increase TIMEOUT_AWAIT_WRITE timeout, use --…
back-to Aug 22, 2021
3ebdc6c
setup: update requests version >=2.26.0 and makeinstaller.sh
back-to Aug 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: "! grep -Ev '^644' <(git ls-files src/ tests/ | xargs stat '--format=%a %n')"
- name: Test
continue-on-error: ${{ matrix.continue || false }}
run: pytest -r a --cov --cov-branch --cov-report=xml
run: pytest -r a --cov --cov-branch --cov-report=xml --durations 10
- name: Upload coverage data
if: github.event_name != 'schedule'
continue-on-error: ${{ matrix.continue || false }}
Expand Down
6 changes: 2 additions & 4 deletions docs/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,7 @@ Name Notes

**Automatically installed by the setup script**
--------------------------------------------------------------------------------
`python-requests`_ At least version **2.26.0** |br|
Temporarily pinpointed to **2.25.1** on Windows (see `#3880`_)
`python-requests`_ At least version **2.26.0**
`pycryptodome`_ Required to play some encrypted streams
`iso-639`_ Used for localization settings, provides language information
`iso3166`_ Used for localization settings, provides country information
Expand Down Expand Up @@ -313,7 +312,7 @@ With these two environment variables it is possible to use `pycrypto`_ instead o

.. _Python: https://www.python.org/
.. _python-setuptools: https://pypi.org/project/setuptools/
.. _python-requests: https://requests.readthedocs.io/en/master/
.. _python-requests: https://docs.python-requests.org/en/master/
.. _RTMPDump: https://rtmpdump.mplayerhq.hu/
.. _pycountry: https://pypi.org/project/pycountry/
.. _pycrypto: https://www.dlitz.net/software/pycrypto/
Expand All @@ -324,7 +323,6 @@ With these two environment variables it is possible to use `pycrypto`_ instead o
.. _isodate: https://pypi.org/project/isodate/
.. _PySocks: https://github.com/Anorov/PySocks
.. _websocket-client: https://pypi.org/project/websocket-client/
.. _#3880: https://github.com/streamlink/streamlink/pull/3880


Windows binaries
Expand Down
8 changes: 4 additions & 4 deletions script/makeinstaller.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@ format=bundled
packages=pkg_resources
iso639
pypi_wheels=certifi==2021.5.30
chardet==4.0.0
idna==2.10
charset-normalizer==2.0.4
idna==3.2
iso3166==1.0.1
isodate==0.6.0
pycryptodome==3.10.1
PySocks==1.7.1
requests==2.25.1
requests==2.26.0
six==1.16.0
urllib3==1.26.6
websocket-client==1.1.0
websocket-client==1.2.1

files=${ROOT}/win32/THIRD-PARTY.txt > \$INSTDIR
${ROOT}/build/lib/streamlink > \$INSTDIR\pkgs
Expand Down
5 changes: 1 addition & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@

data_files = []
deps = [
# Temporarily set requests to 2.25.1 on Windows to fix issues with randomly failing tests
# Don't force an older requests version on non-Windows systems due to packaging reasons
"requests>=2.26.0,<3.0 ; platform_system!='Windows'",
"requests==2.25.1 ; platform_system=='Windows'",
"requests>=2.26.0,<3.0",
"isodate",
"websocket-client>=0.58.0",
# Support for SOCKS proxies
Expand Down
2 changes: 1 addition & 1 deletion tests/mixins/stream_hls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

TIMEOUT_AWAIT_READ = 5
TIMEOUT_AWAIT_READ_ONCE = 5
TIMEOUT_AWAIT_WRITE = 5
TIMEOUT_AWAIT_WRITE = 60 # https://github.com/streamlink/streamlink/issues/3868
TIMEOUT_AWAIT_CLOSE = 5


Expand Down