01-arcadia.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. --- contrib/python/pytest-localserver/py2/pytest_localserver/https.py (index)
  2. +++ contrib/python/pytest-localserver/py2/pytest_localserver/https.py (working tree)
  3. @@ -8,8 +8,8 @@ import os.path
  4. from pytest_localserver.http import ContentServer
  5. #: default server certificate
  6. -DEFAULT_CERTIFICATE = os.path.join(
  7. - os.path.abspath(os.path.dirname(__file__)), 'server.pem')
  8. +
  9. +DEFAULT_CERTIFICATE = os.path.join(os.getcwd(), 'server.pem')
  10. class SecureContentServer (ContentServer):
  11. --- contrib/python/pytest-localserver/py2/pytest_localserver/plugin.py (index)
  12. +++ contrib/python/pytest-localserver/py2/pytest_localserver/plugin.py (working tree)
  13. @@ -5,6 +5,9 @@
  14. #
  15. # This program is release under the MIT license. You can find the full text of
  16. # the license in the LICENSE file.
  17. +import os
  18. +import pkgutil
  19. +
  20. import pytest
  21. @@ -62,10 +65,15 @@ def httpsserver(request):
  22. SSL encryption.
  23. """
  24. from pytest_localserver import https
  25. - server = https.SecureContentServer()
  26. - server.start()
  27. - request.addfinalizer(server.stop)
  28. - return server
  29. + try:
  30. + with open(https.DEFAULT_CERTIFICATE, 'wb') as f:
  31. + f.write(pkgutil.get_data('pytest_localserver', 'server.pem'))
  32. + server = https.SecureContentServer()
  33. + server.start()
  34. + request.addfinalizer(server.stop)
  35. + yield server
  36. + finally:
  37. + os.remove(https.DEFAULT_CERTIFICATE)
  38. @pytest.fixture