Merge into trunk : test-failures-updated-bzrlib-possibly : Code : Commandant

Status:	Merged
Merged at revision:	44
Proposed branch:	lp://staging/~allenap/commandant/test-failures-updated-bzrlib-possibly
Merge into:	lp://staging/commandant
Diff against target:	202 lines (+70/-53) 3 files modified commandant/tests/test_builtins.py (+27/-18) commandant/tests/test_controller.py (+7/-2) commandant/tests/test_help_topics.py (+36/-33)
To merge this branch:	bzr merge lp://staging/~allenap/commandant/test-failures-updated-bzrlib-possibly
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jamu Kakar		2012-09-05	Pending
Review via email: mp+122920@code.staging.launchpad.net

Commit message

Be more forgiving of test output that may vary as a result of changes in dependencies.

The ordering of the standard --quiet and --verbose flags, for example, seems to have changed, possibly as a result of changes in bzrlib. This detail is irrelevant in the tests, however, so testtools.matchers.DocTestMatches is used to test output with more flexibility.

Revision history for this message

Jamu Kakar (jkakar) wrote on 2012-09-05:

#

Download full text (3.3 KiB)

I got a bunch of test failures here:

[ERROR]
Traceback (most recent call last):
Failure: testtools.testresult.real._StringException: ValueError: TestCase.setUp was not called. Have you upcalled all the way up the hierarchy from your setUp? e.g. Call super(HelpCommandTest, self).setUp() from your setUp().

commandant.tests.test_builtins.HelpCommandTest.test_run_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_commands_with_custom_help_help_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_commands_with_custom_help_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_commands_without_docstring
commandant.tests.test_builtins.HelpCommandTest.test_run_hidden_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_hidden_commands_without_hidden_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_many_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_topics
commandant.tests.test_builtins.HelpCommandTest.test_run_topics_ignores_custom_command_help
commandant.tests.test_builtins.HelpCommandTest.test_run_topics_with_custom_help_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_topics_with_custom_underscore_help_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_with_custom_help_text
commandant.tests.test_builtins.HelpCommandTest.test_run_with_custom_help_text_trims_trailing_whitespace
commandant.tests.test_builtins.HelpCommandTest.test_run_with_custom_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_with_custom_topic_strips_whitespace
commandant.tests.test_builtins.HelpCommandTest.test_run_with_hidden_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_with_python_command_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_with_python_command_without_docstring
commandant.tests.test_builtins.HelpCommandTest.test_run_with_stock_help_text
commandant.tests.test_builtins.HelpCommandTest.test_run_with_unknown_command_or_topic_name
===============================================================================
[ERROR]
Traceback (most recent call last):
Failure: testtools.testresult.real._StringException: ValueError: TestCase.setUp was not called. Have you upcalled all the way up the hierarchy from your setUp? e.g. Call super(CommandHelpTopicTest, self).setUp() from your setUp().

commandant.tests.test_help_topics.CommandHelpTopicTest.test_get_help_contents
commandant.tests.test_help_topics.CommandHelpTopicTest.test_instantiate
===============================================================================
[ERROR]
Traceback (most recent call last):
Failure: testtools.testresult.real._StringException: ValueError: TestCase.setUp was not called. Have you upcalled all the way up the hierarchy from your setUp? e.g. Call super(CustomCommandHelpTopicTest, self).setUp() from your setUp().

commandant.tests.test_help_topics.CustomCommandHelpTopicTest.test_get_help_contents
-------------------------------------------------------------------------------
Ran 83 tests in 0.437s

FAILED (errors=23, successes=60)
make: *** [check] Error 1

I've fixed this by adding a new commandant.testing.basic.CommandantTestCase
class that calls the setUp...

I got a bunch of test failures here:

[ERROR]
Traceback (most recent call last):
Failure: testtools.testresult.real._StringException: ValueError: TestCase.setUp was not called. Have you upcalled all the way up the hierarchy from your setUp? e.g. Call super(HelpCommandTest, self).setUp() from your setUp().

commandant.tests.test_builtins.HelpCommandTest.test_run_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_commands_with_custom_help_help_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_commands_with_custom_help_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_commands_without_docstring
commandant.tests.test_builtins.HelpCommandTest.test_run_hidden_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_hidden_commands_without_hidden_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_many_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_topics
commandant.tests.test_builtins.HelpCommandTest.test_run_topics_ignores_custom_command_help
commandant.tests.test_builtins.HelpCommandTest.test_run_topics_with_custom_help_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_topics_with_custom_underscore_help_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_with_custom_help_text
commandant.tests.test_builtins.HelpCommandTest.test_run_with_custom_help_text_trims_trailing_whitespace
commandant.tests.test_builtins.HelpCommandTest.test_run_with_custom_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_with_custom_topic_strips_whitespace
commandant.tests.test_builtins.HelpCommandTest.test_run_with_hidden_commands
commandant.tests.test_builtins.HelpCommandTest.test_run_with_python_command_topic
commandant.tests.test_builtins.HelpCommandTest.test_run_with_python_command_without_docstring
commandant.tests.test_builtins.HelpCommandTest.test_run_with_stock_help_text
commandant.tests.test_builtins.HelpCommandTest.test_run_with_unknown_command_or_topic_name
===============================================================================
[ERROR]
Traceback (most recent call last):
Failure: testtools.testresult.real._StringException: ValueError: TestCase.setUp was not called. Have you upcalled all the way up the hierarchy from your setUp? e.g. Call super(CommandHelpTopicTest, self).setUp() from your setUp().

commandant.tests.test_help_topics.CommandHelpTopicTest.test_get_help_contents
commandant.tests.test_help_topics.CommandHelpTopicTest.test_instantiate
===============================================================================
[ERROR]
Traceback (most recent call last):
Failure: testtools.testresult.real._StringException: ValueError: TestCase.setUp was not called. Have you upcalled all the way up the hierarchy from your setUp? e.g. Call super(CustomCommandHelpTopicTest, self).setUp() from your setUp().

commandant.tests.test_help_topics.CustomCommandHelpTopicTest.test_get_help_contents
-------------------------------------------------------------------------------
Ran 83 tests in 0.437s

FAILED (errors=23, successes=60)
make: *** [check] Error 1

I've fixed this by adding a new commandant.testing.basic.CommandantTestCase
class that calls the setUp and tearDown methods on both ResourcedTestCase
and TestCase.  The broken test cases now inherit from it, instead of doing
multiple inheritance directly.

Thanks for the cleanups!

Commandant

Merge lp://staging/~allenap/commandant/test-failures-updated-bzrlib-possibly into lp://staging/commandant

Commit message

Description of the change

Preview Diff

Subscribers