Charm Helpers

Merge lp://qastaging/~gandelman-a/charm-helpers/sync_include_hints into lp://qastaging/charm-helpers

sync_include_hints
Merge into devel

Proposed by Adam Gandelman on 2013-07-12

Status:	Merged
Merged at revision:	68
Proposed branch:	lp://qastaging/~gandelman-a/charm-helpers/sync_include_hints
Merge into:	lp://qastaging/charm-helpers
Diff against target:	347 lines (+166/-32) 4 files modified setup.cfg (+1/-1) tests/tools/test_charm_helper_sync.py (+63/-11) tools/charm_helpers_sync/README (+25/-0) tools/charm_helpers_sync/charm_helpers_sync.py (+77/-20)
To merge this branch:	bzr merge lp://qastaging/~gandelman-a/charm-helpers/sync_include_hints
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
James Page	2013-07-12	Approve on 2013-08-20
Adam Gandelman (community)		Needs Resubmitting on 2013-07-16
Review via email: mp+174320@code.qastaging.launchpad.net

Commit message

charm_helpers_sync: Allows adding hints to charm sync config to selectively include non-.py files.

Description of the change

We'll (hopefully) soon be including a collection of common template files with the OpenStack helpers. I'd like to be able to sync these into my charms as part of my current workflow, using the charm_helpers_sync tool. This updates the script to allow passing additional config to sync sources, to include files that would currently be excluded from the sync.

Revision history for this message

James Page (james-page) wrote on 2013-07-12:

I think this looks OK - but I did notice that the tests for this tool are not running by default AFAICT.

Running:

python /usr/bin/nosetests --nologcapture tests/tools

Generates alot of output right now but the tests do pass.

review: Needs Information

lp://qastaging/~gandelman-a/charm-helpers/sync_include_hints updated on 2013-07-16

49. By Adam Gandelman on 2013-07-16: setup.cfg: Include tools/ in coverage

Revision history for this message

Adam Gandelman (gandelman-a) wrote on 2013-07-16:

Hmm. Looks like they are running by default:

nosetests -v tests/
...
tests.payload.test_execd.ExecDTestCase.test_execd_submodule_list ... ok
It properly branches the correct helpers branch ... ok
It correctly finds the correct install path within a charm ... ok
It ensures all subdirectories of a parent are python importable ... ok
It extracts multiple options from an included item ... ok
...
Ran 324 tests in 3.461s (with tests/tools/)

vs.

Ran 306 tests in 1.600s (after removing tests/tools)

However, tools/ was not being included in the coverage report, though. I've updated setup.cfg to include it.

Revision history for this message

Adam Gandelman (gandelman-a) on 2013-07-16:

review: Needs Resubmitting

Revision history for this message

James Page (james-page) on 2013-08-20:

review: Approve