Author: kmtracey
Date: 2010-05-04 08:31:25 -0500 (Tue, 04 May 2010)
New Revision: 13093
Modified:
django/branches/releases/1.1.X/tests/regressiontests/utils/module_loading.py
Log:
[1.1.X] Fixed some Python 2.3 incompatibilities in new tests.
Modified:
django/branches/releases/1.1.X/tests/regressiontests/utils/module_loading.py
===================================================================
---
django/branches/releases/1.1.X/tests/regressiontests/utils/module_loading.py
2010-05-04 11:10:36 UTC (rev 13092)
+++
django/branches/releases/1.1.X/tests/regressiontests/utils/module_loading.py
2010-05-04 13:31:25 UTC (rev 13093)
@@ -12,16 +12,16 @@
test_module = import_module('regressiontests.utils.test_module')
# An importable child
- self.assertTrue(module_has_submodule(test_module, 'good_module'))
+ self.failUnless(module_has_submodule(test_module, 'good_module'))
mod = import_module('regressiontests.utils.test_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(test_module, 'bad_module'))
+ self.failUnless(module_has_submodule(test_module, 'bad_module'))
self.assertRaises(ImportError, import_module,
'regressiontests.utils.test_module.bad_module')
# A child that doesn't exist
- self.assertFalse(module_has_submodule(test_module, 'no_such_module'))
+ self.failIf(module_has_submodule(test_module, 'no_such_module'))
self.assertRaises(ImportError, import_module,
'regressiontests.utils.test_module.no_such_module')
class EggLoader(TestCase):
@@ -39,16 +39,16 @@
egg_module = import_module('egg_module')
# An importable child
- self.assertTrue(module_has_submodule(egg_module, 'good_module'))
+ self.failUnless(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.failUnless(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.failIf(module_has_submodule(egg_module, 'no_such_module'))
self.assertRaises(ImportError, import_module,
'egg_module.no_such_module')
def test_deep_loader(self):
@@ -58,16 +58,16 @@
egg_module = import_module('egg_module.sub1.sub2')
# An importable child
- self.assertTrue(module_has_submodule(egg_module, 'good_module'))
+ self.failUnless(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.failUnless(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.failIf(module_has_submodule(egg_module, 'no_such_module'))
self.assertRaises(ImportError, import_module,
'egg_module.sub1.sub2.no_such_module')
class TestFinder(object):
@@ -107,16 +107,16 @@
egg_module = import_module('egg_module')
# An importable child
- self.assertTrue(module_has_submodule(egg_module, 'good_module'))
+ self.failUnless(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.failUnless(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.failIf(module_has_submodule(egg_module, 'no_such_module'))
self.assertRaises(ImportError, import_module,
'egg_module.no_such_module')
def test_deep_loader(self):
@@ -126,14 +126,14 @@
egg_module = import_module('egg_module.sub1.sub2')
# An importable child
- self.assertTrue(module_has_submodule(egg_module, 'good_module'))
+ self.failUnless(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.failUnless(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.failIf(module_has_submodule(egg_module, 'no_such_module'))
self.assertRaises(ImportError, import_module,
'egg_module.sub1.sub2.no_such_module')
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
