From 4cfb7632e0843edb19b38896a77b6e1e43711d77 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Wed, 26 Oct 2011 21:03:18 +0000 Subject: [PATCH] Removed remains from times when tests could be run outside of runtests.py. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17040 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/markup/tests.py | 4 ---- tests/regressiontests/cache/tests.py | 5 ----- tests/regressiontests/db_typecasts/tests.py | 3 --- tests/regressiontests/templates/loaders.py | 3 --- tests/regressiontests/templates/tests.py | 4 ---- 5 files changed, 19 deletions(-) diff --git a/django/contrib/markup/tests.py b/django/contrib/markup/tests.py index 03a653c77a..2eb64d5a9f 100644 --- a/django/contrib/markup/tests.py +++ b/django/contrib/markup/tests.py @@ -83,7 +83,3 @@ Paragraph 2 with a link_ t = Template("{% load markup %}{{ rest_content|restructuredtext }}") rendered = t.render(Context({'rest_content':self.rest_content})).strip() self.assertEqual(rendered, self.rest_content) - - -if __name__ == '__main__': - unittest.main() diff --git a/tests/regressiontests/cache/tests.py b/tests/regressiontests/cache/tests.py index d5c6a43d4f..b92da30422 100644 --- a/tests/regressiontests/cache/tests.py +++ b/tests/regressiontests/cache/tests.py @@ -1581,8 +1581,3 @@ class TestEtagWithAdmin(TestCase): response = self.client.get('/test_admin/admin/') self.assertEqual(response.status_code, 200) self.assertTrue(response.has_header('ETag')) - - -if __name__ == '__main__': - unittest.main() - diff --git a/tests/regressiontests/db_typecasts/tests.py b/tests/regressiontests/db_typecasts/tests.py index cb5984f303..83bd1e6851 100644 --- a/tests/regressiontests/db_typecasts/tests.py +++ b/tests/regressiontests/db_typecasts/tests.py @@ -53,6 +53,3 @@ class DBTypeCasts(unittest.TestCase): for inpt, expected in v: got = getattr(typecasts, k)(inpt) self.assertEqual(got, expected, "In %s: %r doesn't match %r. Got %r instead." % (k, inpt, expected, got)) - -if __name__ == '__main__': - unittest.main() diff --git a/tests/regressiontests/templates/loaders.py b/tests/regressiontests/templates/loaders.py index 45131bf265..5c11916308 100644 --- a/tests/regressiontests/templates/loaders.py +++ b/tests/regressiontests/templates/loaders.py @@ -153,6 +153,3 @@ class RenderToStringTest(unittest.TestCase): self.assertRaisesRegexp(TemplateDoesNotExist, 'No template names provided$', loader.select_template, []) - -if __name__ == "__main__": - unittest.main() diff --git a/tests/regressiontests/templates/tests.py b/tests/regressiontests/templates/tests.py index d0c2204f37..712093b934 100644 --- a/tests/regressiontests/templates/tests.py +++ b/tests/regressiontests/templates/tests.py @@ -1711,7 +1711,3 @@ class RequestContextTests(BaseTemplateResponseTest): template.Template('{% include "child" only %}').render(ctx), 'none' ) - - -if __name__ == "__main__": - unittest.main()