Juju Charm Tools

Merge lp:~tvansteenburgh/charm-tools/bundle-proof-v4 into lp:charm-tools/1.6

  1. bundle-proof-v4
  2. Merge into 1.6
Proposed by Tim Van Steenburgh
Status: Merged
Merged at revision: 355
Proposed branch: lp:~tvansteenburgh/charm-tools/bundle-proof-v4
Merge into: lp:charm-tools/1.6
Diff against target: 62 lines (+14/-1)
3 files modified
charmtools/bundles.py (+4/-1)
tests_functional/create/test_ansible_create.py (+5/-0)
tests_functional/create/test_python_create.py (+5/-0)
To merge this branch: bzr merge lp:~tvansteenburgh/charm-tools/bundle-proof-v4
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email: mp+268596@code.launchpad.net

Description of the change

Update bundle proof for v4.

With v4, the expected bundle file name is bundle.yaml instead of
bundles.yaml.

Also fixed some charm-create tests that were failing due to new files in
charmhelpers.

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmtools/bundles.py'
2--- charmtools/bundles.py 2014-04-02 20:32:53 +0000
3+++ charmtools/bundles.py 2015-08-20 13:36:17 +0000
4@@ -79,7 +79,10 @@
5 class Bundle(object):
6 def __init__(self, path, debug=False):
7 self.bundle_path = os.path.abspath(path)
8- self.supported_files = ['bundles.yaml', 'bundles.json']
9+ self.supported_files = [
10+ 'bundle.yaml', 'bundle.json', # v4
11+ 'bundles.yaml', 'bundles.json', # v3
12+ ]
13 self.debug = debug
14 if not self.is_bundle():
15 raise Exception('Not a bundle')
16
17=== modified file 'tests_functional/create/test_ansible_create.py'
18--- tests_functional/create/test_ansible_create.py 2014-10-22 20:02:21 +0000
19+++ tests_functional/create/test_ansible_create.py 2015-08-20 13:36:17 +0000
20@@ -62,14 +62,19 @@
21 'lib/charmhelpers/contrib/templating/__init__.py',
22 'lib/charmhelpers/contrib/templating/contexts.py',
23 'lib/charmhelpers/core/__init__.py',
24+ 'lib/charmhelpers/core/decorators.py',
25+ 'lib/charmhelpers/core/files.py',
26 'lib/charmhelpers/core/fstab.py',
27 'lib/charmhelpers/core/hookenv.py',
28 'lib/charmhelpers/core/host.py',
29+ 'lib/charmhelpers/core/hugepage.py',
30 'lib/charmhelpers/core/services/__init__.py',
31 'lib/charmhelpers/core/services/base.py',
32 'lib/charmhelpers/core/services/helpers.py',
33+ 'lib/charmhelpers/core/strutils.py',
34 'lib/charmhelpers/core/sysctl.py',
35 'lib/charmhelpers/core/templating.py',
36+ 'lib/charmhelpers/core/unitdata.py',
37 'lib/charmhelpers/fetch/__init__.py',
38 'lib/charmhelpers/fetch/archiveurl.py',
39 'lib/charmhelpers/fetch/bzrurl.py',
40
41=== modified file 'tests_functional/create/test_python_create.py'
42--- tests_functional/create/test_python_create.py 2014-10-22 20:02:21 +0000
43+++ tests_functional/create/test_python_create.py 2015-08-20 13:36:17 +0000
44@@ -53,14 +53,19 @@
45 dynamic_files = [
46 'lib/charmhelpers/__init__.py',
47 'lib/charmhelpers/core/__init__.py',
48+ 'lib/charmhelpers/core/decorators.py',
49+ 'lib/charmhelpers/core/files.py',
50 'lib/charmhelpers/core/fstab.py',
51 'lib/charmhelpers/core/hookenv.py',
52 'lib/charmhelpers/core/host.py',
53+ 'lib/charmhelpers/core/hugepage.py',
54 'lib/charmhelpers/core/services/__init__.py',
55 'lib/charmhelpers/core/services/base.py',
56 'lib/charmhelpers/core/services/helpers.py',
57+ 'lib/charmhelpers/core/strutils.py',
58 'lib/charmhelpers/core/sysctl.py',
59 'lib/charmhelpers/core/templating.py',
60+ 'lib/charmhelpers/core/unitdata.py',
61 ]
62 return sorted(static_files + dynamic_files)
63

Subscribers

People subscribed via source and target branches