02-fix-tests.patch 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. --- contrib/python/Jinja2/py3/tests/conftest.py (index)
  2. +++ contrib/python/Jinja2/py3/tests/conftest.py (working tree)
  3. @@ -27,7 +27,8 @@ def package_loader():
  4. @pytest.fixture
  5. def filesystem_loader():
  6. """returns FileSystemLoader initialized to res/templates directory"""
  7. - here = Path(__file__).parent.resolve()
  8. + import yatest.common
  9. + here = Path(yatest.common.test_source_path())
  10. return loaders.FileSystemLoader(here / "res" / "templates")
  11. --- contrib/python/Jinja2/py3/tests/test_loader.py (index)
  12. +++ contrib/python/Jinja2/py3/tests/test_loader.py (working tree)
  13. @@ -18,6 +18,8 @@ from jinja2._compat import PYPY
  14. from jinja2.exceptions import TemplateNotFound
  15. from jinja2.loaders import split_template_path
  16. +import yatest.common as yc
  17. +
  18. class TestLoaders:
  19. def test_dict_loader(self, dict_loader):
  20. @@ -118,7 +120,7 @@ class TestLoaders(object):
  21. class TestFileSystemLoader:
  22. - searchpath = (Path(__file__) / ".." / "res" / "templates").resolve()
  23. + searchpath = (Path(yc.test_source_path()) / "res" / "templates").resolve()
  24. @staticmethod
  25. def _test_common(env):
  26. @@ -146,6 +148,7 @@ class TestFileSystemLoader(object):
  27. env = Environment(loader=filesystem_loader)
  28. self._test_common(env)
  29. + @pytest.mark.skip("Arcadia read only")
  30. def test_caches_template_based_on_mtime(self):
  31. filesystem_loader = loaders.FileSystemLoader(self.searchpath)
  32. @@ -325,7 +328,7 @@ def test_package_dir_list(package_dir_loader):
  33. @pytest.fixture()
  34. def package_file_loader(monkeypatch):
  35. monkeypatch.syspath_prepend(Path(__file__).parent / "res")
  36. - return PackageLoader("__init__")
  37. + return PackageLoader("res")
  38. @pytest.mark.parametrize(
  39. @@ -346,7 +349,7 @@ def test_package_dir_list(package_dir_loader):
  40. @pytest.fixture()
  41. def package_zip_loader(monkeypatch):
  42. - package_zip = (Path(__file__) / ".." / "res" / "package.zip").resolve()
  43. + package_zip = (Path(yc.test_source_path()) / "res" / "package.zip").resolve()
  44. monkeypatch.syspath_prepend(package_zip)
  45. return PackageLoader("t_pack")
  46. --- contrib/python/Jinja2/py3/tests/test_utils.py (index)
  47. +++ contrib/python/Jinja2/py3/tests/test_utils.py (working tree)
  48. @@ -110,7 +110,7 @@ class TestHelpers(object):
  49. assert object_type_repr(42) == "int object"
  50. assert object_type_repr([]) == "list object"
  51. - assert object_type_repr(X()) == "test_utils.X object"
  52. + assert object_type_repr(X()) == "__tests__.test_utils.X object"
  53. assert object_type_repr(None) == "None"
  54. assert object_type_repr(Ellipsis) == "Ellipsis"