summaryrefslogtreecommitdiff
path: root/tests/regressiontests/admin_scripts
diff options
context:
space:
mode:
authorIan Clelland <ian@fullfactor.com>2012-09-28 10:17:40 -0700
committerLuke Plant <L.Plant.98@cantab.net>2012-10-26 01:40:33 +0100
commitbdcd2f6b105fffea0b8438625a29a1ccb2962680 (patch)
tree4eca7a79bc3b4230567bf5770ab0576e0075809b /tests/regressiontests/admin_scripts
parent02dda22832d313bde18798b2f5f1e9120a849815 (diff)
Avoid dependence on exact Python exception messages
Diffstat (limited to 'tests/regressiontests/admin_scripts')
-rw-r--r--tests/regressiontests/admin_scripts/tests.py6
1 files changed, 4 insertions, 2 deletions
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"