02-fix-tests.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. --- contrib/python/Jinja2/py2/tests/conftest.py (index)
  2. +++ contrib/python/Jinja2/py2/tests/conftest.py (working tree)
  3. @@ -35,7 +35,11 @@ def package_loader():
  4. @pytest.fixture
  5. def filesystem_loader():
  6. """returns FileSystemLoader initialized to res/templates directory"""
  7. - here = os.path.dirname(os.path.abspath(__file__))
  8. + try:
  9. + import yatest.common
  10. + here = yatest.common.test_source_path()
  11. + except ImportError:
  12. + here = os.path.dirname(os.path.abspath(__file__))
  13. return loaders.FileSystemLoader(here + "/res/templates")
  14. --- contrib/python/Jinja2/py2/tests/test_loader.py (index)
  15. +++ contrib/python/Jinja2/py2/tests/test_loader.py (working tree)
  16. @@ -15,6 +15,8 @@ from jinja2._compat import PYPY
  17. from jinja2.exceptions import TemplateNotFound
  18. from jinja2.loaders import split_template_path
  19. +import yatest.common as yc
  20. +
  21. class TestLoaders(object):
  22. def test_dict_loader(self, dict_loader):
  23. @@ -117,7 +119,7 @@ class TestLoaders(object):
  24. class TestFileSystemLoader(object):
  25. searchpath = os.path.join(
  26. - os.path.dirname(os.path.abspath(__file__)), "res", "templates"
  27. + yc.test_source_path(), "res", "templates"
  28. )
  29. @staticmethod
  30. @@ -156,6 +158,7 @@ class TestFileSystemLoader(object):
  31. env = Environment(loader=filesystem_loader)
  32. self._test_common(env)
  33. + @pytest.mark.skip("Arcadia read only")
  34. def test_caches_template_based_on_mtime(self):
  35. filesystem_loader = loaders.FileSystemLoader(self.searchpath)
  36. --- contrib/python/Jinja2/py2/tests/test_utils.py (index)
  37. +++ contrib/python/Jinja2/py2/tests/test_utils.py (working tree)
  38. @@ -125,7 +125,7 @@ class TestHelpers(object):
  39. assert object_type_repr(42) == "int object"
  40. assert object_type_repr([]) == "list object"
  41. - assert object_type_repr(X()) == "test_utils.X object"
  42. + assert object_type_repr(X()) == "__tests__.test_utils.X object"
  43. assert object_type_repr(None) == "None"
  44. assert object_type_repr(Ellipsis) == "Ellipsis"