Merge into main : bzr-export : Code : Tarmac

Status:

Merged

Approved by:

dobey on 2013-10-30

Approved revision:

409

Merged at revision:

409

Proposed branch:

lp://qastaging/~dobey/tarmac/bzr-export

Merge into:

lp://qastaging/tarmac

Diff against target:

156 lines (+39/-15)

4 files modified

HACKING (+4/-4)
docs/introduction.txt (+3/-2)
tarmac/plugins/command.py (+14/-4)
tarmac/plugins/tests/test_command.py (+18/-5)

To merge this branch:

bzr merge lp://qastaging/~dobey/tarmac/bzr-export

Critical

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Mike McCracken	2013-10-29	Approve on 2013-10-30
Chris Johnston		Approve on 2013-10-30
Review via email: mp+193130@code.qastaging.launchpad.net

Commit message

Export the merged tree with changes to a temporary location for testing.
Update the documentation for running the tests, as mock is now required.

Description of the change

This changes Tarmac to always run the verify_command in an exported tree that contains the uncommitted changes, to make it easier to securely run tarmac on a production system with minimal setup.

Revision history for this message

Mike McCracken (mikemc) wrote on 2013-10-30:

#

command.py and test_command.py should have updated copyrights

test_run_exported_tree should have its own personal docstring

review: Needs Fixing

Revision history for this message

Chris Johnston (cjohnston) wrote on 2013-10-30:

#

LG

review: Approve

Revision history for this message

Mike McCracken (mikemc) on 2013-10-30:

#

review: Approve

Revision history for this message

Tarmac Traffic Controller (tarmac-atc) wrote on 2013-10-30:

#

The attempt to merge lp:~dobey/tarmac/bzr-export into lp:tarmac failed. Below is the output from the failed tests.

Traceback (most recent call last):
File "setup.py", line 20, in <module>
from setuptools import setup
ImportError: No module named setuptools

Revision history for this message

Tarmac Traffic Controller (tarmac-atc) wrote on 2013-10-30:

#

Download full text (12.7 KiB)

The attempt to merge lp:~dobey/tarmac/bzr-export into lp:tarmac failed. Below is the output from the failed tests.

running test
running egg_info
creating tarmac.egg-info
writing tarmac.egg-info/PKG-INFO
writing top-level names to tarmac.egg-info/top_level.txt
writing dependency_links to tarmac.egg-info/dependency_links.txt
writing manifest file 'tarmac.egg-info/SOURCES.txt'
reading manifest file 'tarmac.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'tarmac.egg-info/SOURCES.txt'
running build_ext

test_person_is_in_subteam (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_person_is_in_subteam ... ok
test_person_not_in_team (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_person_not_in_team ... ok
test_run (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_run ... ok
test_run_failure (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_run_failure ... ok
test_run_private_team (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_run_private_team ... ok
test_count_pending (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_count_pending ... ok
test_count_votes (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_count_votes ... ok
test_evaluate_criteria (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_evaluate_criteria ... ok
test_parse_criteria (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_parse_criteria ... ok
test_parse_invalid_criteria (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_parse_invalid_criteria ... ok
test_run (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run ... ok
test_run_failure (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run_failure ... ok
test_run_global_config (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run_global_config ... ok
test_run_global_config_failure (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run_global_config_failure ... ok
test_run_no_votes (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run_no_votes ... ok
test_run (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test_run ... ok
test_run_with_no_bugs (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test_run_with_no_bugs ... ok
test_run_with_series (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
...

The attempt to merge lp:~dobey/tarmac/bzr-export into lp:tarmac failed. Below is the output from the failed tests.

running test
running egg_info
creating tarmac.egg-info
writing tarmac.egg-info/PKG-INFO
writing top-level names to tarmac.egg-info/top_level.txt
writing dependency_links to tarmac.egg-info/dependency_links.txt
writing manifest file 'tarmac.egg-info/SOURCES.txt'
reading manifest file 'tarmac.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
writing manifest file 'tarmac.egg-info/SOURCES.txt'
running build_ext

test_person_is_in_subteam (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_person_is_in_subteam ... ok
test_person_not_in_team (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_person_not_in_team ... ok
test_run (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_run ... ok
test_run_failure (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_run_failure ... ok
test_run_private_team (tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests)
tarmac.plugins.tests.test_allowedcontributors.AllowedContributorTests.test_run_private_team ... ok
test_count_pending (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_count_pending ... ok
test_count_votes (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_count_votes ... ok
test_evaluate_criteria (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_evaluate_criteria ... ok
test_parse_criteria (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_parse_criteria ... ok
test_parse_invalid_criteria (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_parse_invalid_criteria ... ok
test_run (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run ... ok
test_run_failure (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run_failure ... ok
test_run_global_config (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run_global_config ... ok
test_run_global_config_failure (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run_global_config_failure ... ok
test_run_no_votes (tarmac.plugins.tests.test_votes.TestVotes)
tarmac.plugins.tests.test_votes.TestVotes.test_run_no_votes ... ok
test_run (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test_run ... ok
test_run_with_no_bugs (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test_run_with_no_bugs ... ok
test_run_with_series (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test_run_with_series ... ok
test_run_with_series_invalid (tarmac.plugins.tests.test_bugresolver.BugResolverTests)
tarmac.plugins.tests.test_bugresolver.BugResolverTests.test_run_with_series_invalid ... ok
test_render (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplate)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplate.test_render ... ok
test___getitem__ (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo.test___getitem__ ... ok
test_approved_by (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo.test_approved_by ... ok
test_approved_by_nicks (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo.test_approved_by_nicks ... ok
test_author (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo.test_author ... ok
test_author_nick (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo.test_author_nick ... ok
test_bugs_fixed (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo.test_bugs_fixed ... ok
test_commit_message (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo.test_commit_message ... ok
test_review_url (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo.test_review_url ... ok
test_reviewer (tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo)
tarmac.plugins.tests.test_commitmessage.TestCommitMessageTemplateInfo.test_reviewer ... ok
test_run (tarmac.plugins.tests.test_recipebuilder.RecipeBuilderTests)
tarmac.plugins.tests.test_recipebuilder.RecipeBuilderTests.test_run ... ok
test_run (tarmac.plugins.tests.test_command.TestCommand)
tarmac.plugins.tests.test_command.TestCommand.test_run ... ok
test_run_exported_tree (tarmac.plugins.tests.test_command.TestCommand)
tarmac.plugins.tests.test_command.TestCommand.test_run_exported_tree ... ERROR
test_run_failure (tarmac.plugins.tests.test_command.TestCommand)
tarmac.plugins.tests.test_command.TestCommand.test_run_failure ... ok
test_get_unset_value_returns_none (tarmac.tests.test_config.BranchConfigTestCase)
tarmac.tests.test_config.BranchConfigTestCase.test_get_unset_value_returns_none ... ok
test_get_value (tarmac.tests.test_config.BranchConfigTestCase)
tarmac.tests.test_config.BranchConfigTestCase.test_get_value ... ok
test_check_config_dirs (tarmac.tests.test_config.TestTarmacConfig)
tarmac.tests.test_config.TestTarmacConfig.test_check_config_dirs ... ok
test_remove_option (tarmac.tests.test_config.TestTarmacConfig)
tarmac.tests.test_config.TestTarmacConfig.test_remove_option ... ok
test_section_log_file (tarmac.tests.test_config.TestTarmacConfig)
tarmac.tests.test_config.TestTarmacConfig.test_section_log_file ... ok
test_section_log_file_NOT_SET (tarmac.tests.test_config.TestTarmacConfig)
tarmac.tests.test_config.TestTarmacConfig.test_section_log_file_NOT_SET ... ok
test_section_tree_dir (tarmac.tests.test_config.TestTarmacConfig)
tarmac.tests.test_config.TestTarmacConfig.test_section_tree_dir ... ok
test_section_tree_dir_NOT_SET (tarmac.tests.test_config.TestTarmacConfig)
tarmac.tests.test_config.TestTarmacConfig.test_section_tree_dir_NOT_SET ... ok
test_set (tarmac.tests.test_config.TestTarmacConfig)
tarmac.tests.test_config.TestTarmacConfig.test_set ... ok
test_cleanup (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_cleanup ... ok
test_create (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_create ... ok
test_create_missing_parent_dir (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_create_missing_parent_dir ... ok
test_create_with_tree (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_create_with_tree ... ok
test_merge (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_merge ... ok
test_merge_no_changes (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_merge_no_changes ... ok
test_merge_raises_exception_with_no_tree (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_merge_raises_exception_with_no_tree ... ok
test_merge_with_authors (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_merge_with_authors ... ok
test_merge_with_bugs (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_merge_with_bugs ... ok
test_merge_with_reviews (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_merge_with_reviews ... ok
test_unmanaged_files (tarmac.tests.test_branch.TestBranch)
tarmac.tests.test_branch.TestBranch.test_unmanaged_files ... ok
test_ensure_log_dir_cannot_create (tarmac.tests.test_log.TestSetupLogging)
tarmac.tests.test_log.TestSetupLogging.test_ensure_log_dir_cannot_create ... ok
test_ensure_log_dir_creates (tarmac.tests.test_log.TestSetupLogging)
tarmac.tests.test_log.TestSetupLogging.test_ensure_log_dir_creates ... ok
test_ensure_log_dir_existing (tarmac.tests.test_log.TestSetupLogging)
tarmac.tests.test_log.TestSetupLogging.test_ensure_log_dir_existing ... ok
test_ensure_log_dir_handles_no_file (tarmac.tests.test_log.TestSetupLogging)
tarmac.tests.test_log.TestSetupLogging.test_ensure_log_dir_handles_no_file ... ok
test_set_up_logging_ensures_directory (tarmac.tests.test_log.TestSetupLogging)
tarmac.tests.test_log.TestSetupLogging.test_set_up_logging_ensures_directory ... ok
test__get_command (tarmac.tests.test_registry.TestCommandRegistry)
tarmac.tests.test_registry.TestCommandRegistry.test__get_command ... ok
test__get_command_notfound (tarmac.tests.test_registry.TestCommandRegistry)
tarmac.tests.test_registry.TestCommandRegistry.test__get_command_notfound ... ok
test__init__ (tarmac.tests.test_registry.TestCommandRegistry)
tarmac.tests.test_registry.TestCommandRegistry.test__init__ ... ok
test__run (tarmac.tests.test_registry.TestCommandRegistry)
tarmac.tests.test_registry.TestCommandRegistry.test__run ... ok
test_register_command (tarmac.tests.test_registry.TestCommandRegistry)
tarmac.tests.test_registry.TestCommandRegistry.test_register_command ... ok
test_register_from_module (tarmac.tests.test_registry.TestCommandRegistry)
tarmac.tests.test_registry.TestCommandRegistry.test_register_from_module ... ok
test_run_already_authenticated (tarmac.tests.test_commands.TestAuthCommand)
tarmac.tests.test_commands.TestAuthCommand.test_run_already_authenticated ... ok
test__init__ (tarmac.tests.test_commands.TestCommand)
tarmac.tests.test_commands.TestCommand.test__init__ ... ok
test_run (tarmac.tests.test_commands.TestCommand)
tarmac.tests.test_commands.TestCommand.test_run ... ok
test_run (tarmac.tests.test_commands.TestHelpCommand)
tarmac.tests.test_commands.TestHelpCommand.test_run ... ok
test_get_reviews (tarmac.tests.test_commands.TestMergeCommand)
tarmac.tests.test_commands.TestMergeCommand.test_get_reviews ... ok
test_run (tarmac.tests.test_commands.TestMergeCommand)
tarmac.tests.test_commands.TestMergeCommand.test_run ... ok
test_run_merge_url_substitution (tarmac.tests.test_commands.TestMergeCommand)
tarmac.tests.test_commands.TestMergeCommand.test_run_merge_url_substitution ... ok
test_run_merge_with_prerequisite_with_multiple_proposals_fails (tarmac.tests.test_commands.TestMergeCommand)
tarmac.tests.test_commands.TestMergeCommand.test_run_merge_with_prerequisite_with_multiple_proposals_fails ... ok
test_run_merge_with_unmerged_prerequisite_fails (tarmac.tests.test_commands.TestMergeCommand)
tarmac.tests.test_commands.TestMergeCommand.test_run_merge_with_unmerged_prerequisite_fails ... Exception OSError: OSError(2, 'No such file or directory') in <bound method Branch.__del__ of <tarmac.branch.Branch object at 0x2cdfad0>> ignored
ok
test_run_merge_with_unproposed_prerequisite_fails (tarmac.tests.test_commands.TestMergeCommand)
tarmac.tests.test_commands.TestMergeCommand.test_run_merge_with_unproposed_prerequisite_fails ... Exception OSError: OSError(2, 'No such file or directory') in <bound method Branch.__del__ of <tarmac.branch.Branch object at 0x3a758d0>> ignored
ok
test_run_no_reviewed_revid (tarmac.tests.test_commands.TestMergeCommand)
tarmac.tests.test_commands.TestMergeCommand.test_run_no_reviewed_revid ... Exception OSError: OSError(2, 'No such file or directory') in <bound method Branch.__del__ of <tarmac.branch.Branch object at 0x3e52710>> ignored
ok
test_run_unapprovedchanges (tarmac.tests.test_commands.TestMergeCommand)
tarmac.tests.test_commands.TestMergeCommand.test_run_unapprovedchanges ... ok

======================================================================
ERROR: test_run_exported_tree (tarmac.plugins.tests.test_command.TestCommand)
tarmac.plugins.tests.test_command.TestCommand.test_run_exported_tree
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/tmp/tmpWU0T1S/tarmac/plugins/tests/test_command.py", line 71, in test_run_exported_tree
    self.assertTrue(mocked.called_args_list[1].startswith(
TypeError: 'Mock' object does not support indexing

----------------------------------------------------------------------
Ran 76 tests in 34.194s

FAILED (errors=1)

Tarmac

Merge lp://qastaging/~dobey/tarmac/bzr-export into lp://qastaging/tarmac

Commit message

Description of the change

Preview Diff

Subscribers