From b91c23e15ec576f8db2c6402d3c69b78acc70d7d Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 23 Sep 2010 03:33:19 +0200 Subject: [PATCH 1/2] Fixed issue 12 -- Make the test not break other tests. --- dbtemplates/tests.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dbtemplates/tests.py b/dbtemplates/tests.py index 9dd79ad..58cb3c2 100644 --- a/dbtemplates/tests.py +++ b/dbtemplates/tests.py @@ -29,22 +29,25 @@ class DbTemplatesTestCase(TestCase): def test_load_templates(self): self.test_basiscs() + original_template_source_loaders = loader.template_source_loaders loader.template_source_loaders = [load_template_source] - result1 = loader.get_template("base.html").render(Context({'title':'MainPage'})) - self.assertEqual(result1, u'Welcome at MainPage') - - result2 = loader.get_template("sub.html").render(Context({'title':'SubPage'})) - self.assertEqual(result2, u'This is SubPage') - - if VERSION[:2] >= (1, 2): - from dbtemplates.loader import Loader - dbloader = Loader() - loader.template_source_loaders = [dbloader.load_template_source] - result = loader.get_template("base.html").render(Context({'title':'MainPage'})) - self.assertEqual(result, u'Welcome at MainPage') + try: + result1 = loader.get_template("base.html").render(Context({'title':'MainPage'})) + self.assertEqual(result1, u'Welcome at MainPage') result2 = loader.get_template("sub.html").render(Context({'title':'SubPage'})) self.assertEqual(result2, u'This is SubPage') + if VERSION[:2] >= (1, 2): + from dbtemplates.loader import Loader + dbloader = Loader() + loader.template_source_loaders = [dbloader.load_template_source] + result = loader.get_template("base.html").render(Context({'title':'MainPage'})) + self.assertEqual(result, u'Welcome at MainPage') + result2 = loader.get_template("sub.html").render(Context({'title':'SubPage'})) + self.assertEqual(result2, u'This is SubPage') + finally: + loader.template_source_loaders = original_template_source_loaders + def test_error_templates_creation(self): call_command('create_error_templates', force=True, verbosity=0) self.assertEqual(list(Template.objects.filter(sites=self.site1)), From b0e64ffd4ce9e272f8d8b400e567218f5cb7a32b Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 23 Sep 2010 04:01:49 +0200 Subject: [PATCH 2/2] Bumped to 0.7.4. --- dbtemplates/__init__.py | 2 +- docs/conf.py | 4 ++-- docs/overview.txt | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dbtemplates/__init__.py b/dbtemplates/__init__.py index 4910b9e..ed9d4d8 100644 --- a/dbtemplates/__init__.py +++ b/dbtemplates/__init__.py @@ -1 +1 @@ -__version__ = "0.7.3" +__version__ = "0.7.4" diff --git a/docs/conf.py b/docs/conf.py index befa830..09e52e2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -45,9 +45,9 @@ copyright = u'2010, Jannis Leidel' # built documents. # # The short X.Y version. -version = '0.7.3' +version = '0.7.4' # The full version, including alpha/beta/rc tags. -release = '0.7.3' +release = '0.7.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/overview.txt b/docs/overview.txt index 0f90bea..0d732fb 100644 --- a/docs/overview.txt +++ b/docs/overview.txt @@ -295,6 +295,11 @@ Admin actions Changelog ========= +0.7.4 (09-23-10) +---------------- + +* Fixed tests. + 0.7.3 (09-21-10) ----------------