[Django14/el6] add no-egg-test-patch
Matthias Runge
mrunge at fedoraproject.org
Thu Aug 15 12:00:16 UTC 2013
commit f32bcf4390ab359f5c100d5413eed1c380ccbcbb
Author: Matthias Runge <mrunge at redhat.com>
Date: Thu Aug 15 14:00:00 2013 +0200
add no-egg-test-patch
Django-1.4-no-egg-test.patch | 124 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 124 insertions(+), 0 deletions(-)
---
diff --git a/Django-1.4-no-egg-test.patch b/Django-1.4-no-egg-test.patch
new file mode 100644
index 0000000..4cc777e
--- /dev/null
+++ b/Django-1.4-no-egg-test.patch
@@ -0,0 +1,124 @@
+diff -up ./tests/regressiontests/app_loading/tests.py.bak ./tests/regressiontests/app_loading/tests.py
+--- ./tests/regressiontests/app_loading/tests.py.bak 2013-04-03 12:15:34.038335480 +0200
++++ ./tests/regressiontests/app_loading/tests.py 2013-04-03 12:16:09.526221416 +0200
+@@ -26,45 +26,6 @@ class EggLoadingTest(TestCase):
+ cache.app_models = self.old_app_models
+ cache.app_store = self.old_app_store
+
+- def test_egg1(self):
+- """Models module can be loaded from an app in an egg"""
+- egg_name = '%s/modelapp.egg' % self.egg_dir
+- sys.path.append(egg_name)
+- models = load_app('app_with_models')
+- self.assertFalse(models is None)
+-
+- def test_egg2(self):
+- """Loading an app from an egg that has no models returns no models (and no error)"""
+- egg_name = '%s/nomodelapp.egg' % self.egg_dir
+- sys.path.append(egg_name)
+- models = load_app('app_no_models')
+- self.assertTrue(models is None)
+-
+- def test_egg3(self):
+- """Models module can be loaded from an app located under an egg's top-level package"""
+- egg_name = '%s/omelet.egg' % self.egg_dir
+- sys.path.append(egg_name)
+- models = load_app('omelet.app_with_models')
+- self.assertFalse(models is None)
+-
+- def test_egg4(self):
+- """Loading an app with no models from under the top-level egg package generates no error"""
+- egg_name = '%s/omelet.egg' % self.egg_dir
+- sys.path.append(egg_name)
+- models = load_app('omelet.app_no_models')
+- self.assertTrue(models is None)
+-
+- def test_egg5(self):
+- """Loading an app from an egg that has an import error in its models module raises that error"""
+- egg_name = '%s/brokenapp.egg' % self.egg_dir
+- sys.path.append(egg_name)
+- self.assertRaises(ImportError, load_app, 'broken_app')
+- try:
+- load_app('broken_app')
+- except ImportError, e:
+- # Make sure the message is indicating the actual
+- # problem in the broken app.
+- self.assertTrue("modelz" in e.args[0])
+
+
+ class GetModelsTest(TestCase):
+diff -up ./tests/regressiontests/templates/tests.py.bak ./tests/regressiontests/templates/tests.py
+--- ./tests/regressiontests/templates/tests.py.bak 2013-04-03 12:16:23.873175302 +0200
++++ ./tests/regressiontests/templates/tests.py 2013-04-03 12:39:35.777700936 +0200
+@@ -1718,24 +1718,7 @@ class TemplateTagLoading(unittest.TestCa
+ self.assertTrue('ImportError' in e.args[0])
+ self.assertTrue('Xtemplate' in e.args[0])
+
+- def test_load_error_egg(self):
+- ttext = "{% load broken_egg %}"
+- egg_name = '%s/tagsegg.egg' % self.egg_dir
+- sys.path.append(egg_name)
+- settings.INSTALLED_APPS = ('tagsegg',)
+- self.assertRaises(template.TemplateSyntaxError, template.Template, ttext)
+- try:
+- template.Template(ttext)
+- except template.TemplateSyntaxError, e:
+- self.assertTrue('ImportError' in e.args[0])
+- self.assertTrue('Xtemplate' in e.args[0])
+
+- def test_load_working_egg(self):
+- ttext = "{% load working_egg %}"
+- egg_name = '%s/tagsegg.egg' % self.egg_dir
+- sys.path.append(egg_name)
+- settings.INSTALLED_APPS = ('tagsegg',)
+- t = template.Template(ttext)
+
+
+ class RequestContextTests(BaseTemplateResponseTest):
+diff -up ./tests/regressiontests/utils/module_loading.py.bak ./tests/regressiontests/utils/module_loading.py
+--- ./tests/regressiontests/utils/module_loading.py.bak 2013-04-03 12:17:11.144023363 +0200
++++ ./tests/regressiontests/utils/module_loading.py 2013-04-03 12:18:40.020737688 +0200
+@@ -64,43 +64,6 @@ class EggLoader(unittest.TestCase):
+ sys.modules.pop('egg_module.good_module', None)
+ sys.modules.pop('egg_module', None)
+
+- def test_shallow_loader(self):
+- "Module existence can be tested inside eggs"
+- egg_name = '%s/test_egg.egg' % self.egg_dir
+- sys.path.append(egg_name)
+- egg_module = import_module('egg_module')
+-
+- # An importable child
+- self.assertTrue(module_has_submodule(egg_module, 'good_module'))
+- mod = import_module('egg_module.good_module')
+- self.assertEqual(mod.content, 'Good Module')
+-
+- # A child that exists, but will generate an import error if loaded
+- self.assertTrue(module_has_submodule(egg_module, 'bad_module'))
+- self.assertRaises(ImportError, import_module, 'egg_module.bad_module')
+-
+- # A child that doesn't exist
+- self.assertFalse(module_has_submodule(egg_module, 'no_such_module'))
+- self.assertRaises(ImportError, import_module, 'egg_module.no_such_module')
+-
+- def test_deep_loader(self):
+- "Modules deep inside an egg can still be tested for existence"
+- egg_name = '%s/test_egg.egg' % self.egg_dir
+- sys.path.append(egg_name)
+- egg_module = import_module('egg_module.sub1.sub2')
+-
+- # An importable child
+- self.assertTrue(module_has_submodule(egg_module, 'good_module'))
+- mod = import_module('egg_module.sub1.sub2.good_module')
+- self.assertEqual(mod.content, 'Deep Good Module')
+-
+- # A child that exists, but will generate an import error if loaded
+- self.assertTrue(module_has_submodule(egg_module, 'bad_module'))
+- self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.bad_module')
+-
+- # A child that doesn't exist
+- self.assertFalse(module_has_submodule(egg_module, 'no_such_module'))
+- self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.no_such_module')
+
+ class ProxyFinder(object):
+ def __init__(self):
More information about the scm-commits
mailing list