fix: Jinja2 and mako test path issues

2 files changed, 13 insertions, 8 deletions

diff --git a/test/test_jinja2.py b/test/test_jinja2.py
index 6cae4fb..6d59032 100644
--- a/test/test_jinja2.py
+++ b/test/test_jinja2.py
@@ -2,7 +2,9 @@
 import unittest
 from bottle import Jinja2Template, jinja2_template, jinja2_view, touni
 from .tools import warn
+import os
 
+views_dir = os.path.join(os.path.dirname(__file__), 'views')
 
 class TestJinja2Template(unittest.TestCase):
 
@@ -13,12 +15,12 @@ class TestJinja2Template(unittest.TestCase):
 
     def test_file(self):
         """ Templates: Jinja2 file"""
-        t = Jinja2Template(name='./views/jinja2_simple.tpl').render(var='var')
+        t = Jinja2Template(name=views_dir + os.sep + 'jinja2_simple.tpl').render(var='var')
         self.assertEqual('start var end', ''.join(t))
 
     def test_name(self):
         """ Templates: Jinja2 lookup by name """
-        t = Jinja2Template(name='jinja2_simple', lookup=['./views/']).render(var='var')
+        t = Jinja2Template(name='jinja2_simple', lookup=[views_dir]).render(var='var')
         self.assertEqual('start var end', ''.join(t))
 
     def test_notfound(self):
@@ -31,7 +33,7 @@ class TestJinja2Template(unittest.TestCase):
 
     def test_inherit(self):
         """ Templates: Jinja2 lookup and inherience """
-        t = Jinja2Template(name='jinja2_inherit', lookup=['./views/']).render()
+        t = Jinja2Template(name='jinja2_inherit', lookup=[views_dir]).render()
         self.assertEqual('begin abc end', ''.join(t))
 
     def test_custom_filters(self):
diff --git a/test/test_mako.py b/test/test_mako.py
index 89f10b6..126f589 100644
--- a/test/test_mako.py
+++ b/test/test_mako.py
@@ -1,6 +1,9 @@
 import unittest
 from .tools import warn
 from bottle import MakoTemplate, mako_template, mako_view, touni
+import os
+
+views_dir = os.path.join(os.path.dirname(__file__), 'views')
 
 class TestMakoTemplate(unittest.TestCase):
     def test_string(self):
@@ -10,12 +13,12 @@ class TestMakoTemplate(unittest.TestCase):
 
     def test_file(self):
         """ Templates: Mako file"""
-        t = MakoTemplate(name='./views/mako_simple.tpl').render(var='var')
+        t = MakoTemplate(name=views_dir + os.sep + 'mako_simple.tpl').render(var='var')
         self.assertEqual('start var end\n', t)
 
     def test_name(self):
         """ Templates: Mako lookup by name """
-        t = MakoTemplate(name='mako_simple', lookup=['./views/']).render(var='var')
+        t = MakoTemplate(name='mako_simple', lookup=[views_dir]).render(var='var')
         self.assertEqual('start var end\n', t)
 
     def test_notfound(self):
@@ -28,11 +31,11 @@ class TestMakoTemplate(unittest.TestCase):
 
     def test_inherit(self):
         """ Templates: Mako lookup and inherience """
-        t = MakoTemplate(name='mako_inherit', lookup=['./views/']).render(var='v')
+        t = MakoTemplate(name='mako_inherit', lookup=[views_dir]).render(var='v')
         self.assertEqual('o\ncvc\no\n', t)
-        t = MakoTemplate('<%inherit file="mako_base.tpl"/>\nc${var}c\n', lookup=['./views/']).render(var='v')
+        t = MakoTemplate('<%inherit file="mako_base.tpl"/>\nc${var}c\n', lookup=[views_dir]).render(var='v')
         self.assertEqual('o\ncvc\no\n', t)
-        t = MakoTemplate('<%inherit file="views/mako_base.tpl"/>\nc${var}c\n', lookup=['./']).render(var='v')
+        t = MakoTemplate('<%inherit file="views/mako_base.tpl"/>\nc${var}c\n', lookup=[os.path.dirname(views_dir)]).render(var='v')
         self.assertEqual('o\ncvc\no\n', t)
 
     def test_template_shortcut(self):