Merge lp:~adeuring/charmworld/bump-charmtools-version into lp:~juju-jitsu/charmworld/trunk

[Abel Deuring]

Use a version of the charmtools source tarball that includes checks of config.yaml

Testing the branch that was merged yesterday (lp:~adeuring/charmworld/use-charmtools-tarball), I noticed that version 1.0.1 of charmtools cannot yet check config.yaml files.

This branch changes the version of charmtools we want; I built a "private" tarball with this version -- waiting for an "official" release may need some patience...

Running the test suite, I noticed a failure in test_proof: the results of prrofing our test data changed. This failure is an implicit test that we now do indeed check the config.yaml files -- but it also shows that it was probably right to use a tarball as the source of charmtools, instead of using a reguler installation from a deb package that, originating from a PPA, might occasionally change and thus casuing unexpected test failures.

[Brad Crittenden (bac)]

Looks good. Thanks.

review: Approve (code)

[Juju Gui Bot (juju-gui-bot)]

review: Approve (continuous-integration)

=== modified file 'charmworld/jobs/tests/test_proof.py'
--- charmworld/jobs/tests/test_proof.py	2013-10-10 11:31:24 +0000
+++ charmworld/jobs/tests/test_proof.py	2013-10-11 13:17:40 +0000
@@ -35,7 +35,7 @@
                     ' Unknown root metadata field (dotted.name)',
                     ' no copyright file',
                     ' relation ssl_website is not a map',
-                    ' relation sql_db is not a map'
+                    ' relation sql_db is not a map',
                 ],
                 'w': [
                     ' Metadata is missing categories.',
@@ -44,11 +44,14 @@
                     ' install not executable',
                     ' start not executable',
                     ' stop not executable',
-                    ' config-changed not executable'
+                    ' config-changed not executable',
+                    ' config.yaml: option source has an invalid type (string)',
+                    (' config.yaml: option error-email has an invalid '
+                     'type (string)'),
                 ],
                 'i': [
                     ' relation ssl_website has no hooks',
-                    ' relation sql_db has no hooks'
+                    ' relation sql_db has no hooks',
                 ],
             },
             charm['proof'])

=== modified file 'requirements.txt'
--- requirements.txt	2013-10-10 11:27:55 +0000
+++ requirements.txt	2013-10-11 13:17:40 +0000
@@ -3,7 +3,7 @@
 Beaker==1.6.4
 bzr==2.5.1
 Chameleon==2.5.1
-charmtools==1.0.1
+charmtools==1.1.0-252-cw
 colander==0.9.9
 configobj==4.7.2
 deform==0.9.5