Author: russellm
Date: 2008-10-03 20:16:30 -0500 (Fri, 03 Oct 2008)
New Revision: 9112
Modified:
django/trunk/tests/regressiontests/admin_scripts/tests.py
Log:
Fixed #9293: Corrected expected test output for the admin_scripts tests,
following the changes to --verbosity in 9110. Thanks to Alex for the report.
Modified: django/trunk/tests/regressiontests/admin_scripts/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/tests.py 2008-10-03
16:19:39 UTC (rev 9111)
+++ django/trunk/tests/regressiontests/admin_scripts/tests.py 2008-10-04
01:16:30 UTC (rev 9112)
@@ -921,42 +921,42 @@
args = ['base_command','testlabel']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', '1'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', '1'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity',
'1')]")
def test_base_command_no_label(self):
"User BaseCommands can execute when no labels are provided"
args = ['base_command']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=(),
options=[('option_a', '1'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=(),
options=[('option_a', '1'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity',
'1')]")
def test_base_command_multiple_label(self):
"User BaseCommands can execute when no labels are provided"
args = ['base_command','testlabel','anotherlabel']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',
'anotherlabel'), options=[('option_a', '1'), ('option_b', '2'), ('option_c',
'3'), ('pythonpath', None), ('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',
'anotherlabel'), options=[('option_a', '1'), ('option_b', '2'), ('option_c',
'3'), ('pythonpath', None), ('settings', None), ('traceback', None),
('verbosity', '1')]")
def test_base_command_with_option(self):
"User BaseCommands can execute with options when a label is provided"
args = ['base_command','testlabel','--option_a=x']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity',
'1')]")
def test_base_command_with_options(self):
"User BaseCommands can execute with multiple options when a label is
provided"
args = ['base_command','testlabel','-a','x','--option_b=y']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', 'y'), ('option_c', '3'),
('pythonpath', None), ('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', 'y'), ('option_c', '3'),
('pythonpath', None), ('settings', None), ('traceback', None), ('verbosity',
'1')]")
def test_noargs(self):
"NoArg Commands can be executed"
args = ['noargs_command']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:NoArgsCommand options=[('pythonpath',
None), ('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:NoArgsCommand options=[('pythonpath',
None), ('settings', None), ('traceback', None), ('verbosity', '1')]")
def test_noargs_with_args(self):
"NoArg Commands raise an error if an argument is provided"
@@ -971,7 +971,7 @@
self.assertNoOutput(err)
self.assertOutput(out, "EXECUTE:AppCommand app=<module
'django.contrib.auth.models'")
self.assertOutput(out,
os.sep.join(['django','contrib','auth','models.py']))
- self.assertOutput(out, "'>, options=[('pythonpath', None),
('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "'>, options=[('pythonpath', None),
('settings', None), ('traceback', None), ('verbosity', '1')]")
def test_app_command_no_apps(self):
"User AppCommands raise an error when no app name is provided"
@@ -986,10 +986,10 @@
self.assertNoOutput(err)
self.assertOutput(out, "EXECUTE:AppCommand app=<module
'django.contrib.auth.models'")
self.assertOutput(out,
os.sep.join(['django','contrib','auth','models.py']))
- self.assertOutput(out, "'>, options=[('pythonpath', None),
('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "'>, options=[('pythonpath', None),
('settings', None), ('traceback', None), ('verbosity', '1')]")
self.assertOutput(out, "EXECUTE:AppCommand app=<module
'django.contrib.contenttypes.models'")
self.assertOutput(out,
os.sep.join(['django','contrib','contenttypes','models.py']))
- self.assertOutput(out, "'>, options=[('pythonpath', None),
('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "'>, options=[('pythonpath', None),
('settings', None), ('traceback', None), ('verbosity', '1')]")
def test_app_command_invalid_appname(self):
"User AppCommands can execute when a single app name is provided"
@@ -1008,7 +1008,7 @@
args = ['label_command','testlabel']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:LabelCommand label=testlabel,
options=[('pythonpath', None), ('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:LabelCommand label=testlabel,
options=[('pythonpath', None), ('settings', None), ('traceback', None),
('verbosity', '1')]")
def test_label_command_no_label(self):
"User LabelCommands raise an error if no label is provided"
@@ -1021,8 +1021,8 @@
args = ['label_command','testlabel','anotherlabel']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:LabelCommand label=testlabel,
options=[('pythonpath', None), ('settings', None), ('traceback', None)]")
- self.assertOutput(out, "EXECUTE:LabelCommand label=anotherlabel,
options=[('pythonpath', None), ('settings', None), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:LabelCommand label=testlabel,
options=[('pythonpath', None), ('settings', None), ('traceback', None),
('verbosity', '1')]")
+ self.assertOutput(out, "EXECUTE:LabelCommand label=anotherlabel,
options=[('pythonpath', None), ('settings', None), ('traceback', None),
('verbosity', '1')]")
class ArgumentOrder(AdminScriptTestCase):
"""Tests for 2-stage argument parsing scheme.
@@ -1046,33 +1046,33 @@
args =
['base_command','testlabel','--settings=alternate_settings','--option_a=x']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None),
('verbosity', '1')]")
def test_setting_then_short_option(self):
"Short options passed after settings are correctly handled"
args =
['base_command','testlabel','--settings=alternate_settings','--option_a=x']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None),
('verbosity', '1')]")
def test_option_then_setting(self):
"Options passed before settings are correctly handled"
args =
['base_command','testlabel','--option_a=x','--settings=alternate_settings']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None),
('verbosity', '1')]")
def test_short_option_then_setting(self):
"Short options passed before settings are correctly handled"
args =
['base_command','testlabel','-a','x','--settings=alternate_settings']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', '2'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None),
('verbosity', '1')]")
def test_option_then_setting_then_option(self):
"Options are correctly handled when they are passed before and after a
setting"
args =
['base_command','testlabel','--option_a=x','--settings=alternate_settings','--option_b=y']
out, err = self.run_manage(args)
self.assertNoOutput(err)
- self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', 'y'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None)]")
+ self.assertOutput(out, "EXECUTE:BaseCommand labels=('testlabel',),
options=[('option_a', 'x'), ('option_b', 'y'), ('option_c', '3'),
('pythonpath', None), ('settings', 'alternate_settings'), ('traceback', None),
('verbosity', '1')]")
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
