From 3deed3239470304a67013b5cdc864a8a2087bacf Mon Sep 17 00:00:00 2001 From: Ian Clelland Date: Fri, 28 Sep 2012 10:17:40 -0700 Subject: [1.5.x] Avoid dependence on exact Python exception messages Backport of a8bbae517963d7cc489fb35e51288e4f0efd8207 from master --- tests/regressiontests/admin_scripts/tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/regressiontests/admin_scripts') diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index a5deba7fe1..3bb8bb0b50 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -1010,7 +1010,8 @@ class ManageSettingsWithImportError(AdminScriptTestCase): args = ['sqlall', 'admin_scripts'] out, err = self.run_manage(args) self.assertNoOutput(out) - self.assertOutput(err, "No module named foo42bar") + self.assertOutput(err, "No module named") + self.assertOutput(err, "foo42bar") def test_builtin_command_with_attribute_error(self): """ @@ -1033,7 +1034,8 @@ class ManageValidate(AdminScriptTestCase): args = ['validate'] out, err = self.run_manage(args) self.assertNoOutput(out) - self.assertOutput(err, 'No module named admin_scriptz') + self.assertOutput(err, 'No module named') + self.assertOutput(err, 'admin_scriptz') def test_broken_app(self): "manage.py validate reports an ImportError if an app's models.py raises one on import" -- cgit v1.3