CharmSupport

Merge lp://staging/~thedac/charmsupport/volume-management into lp://staging/charmsupport

volume-management
Merge into trunk

Proposed by David Ames on 2013-04-23

Status:	Merged
Approved by:	Matthew Wedgwood on 2013-04-24
Approved revision:	39
Merged at revision:	37
Proposed branch:	lp://staging/~thedac/charmsupport/volume-management
Merge into:	lp://staging/charmsupport
Diff against target:	57 lines (+8/-6) 3 files modified charmsupport/hookenv.py (+5/-1) charmsupport/volumes.py (+1/-1) tests/test_hookenv.py (+2/-4)
To merge this branch:	bzr merge lp://staging/~thedac/charmsupport/volume-management
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Matthew Wedgwood (community)	2013-04-23	Approve on 2013-04-24
Sidnei da Silva (community)		Approve on 2013-04-24
Review via email: mp+160518@code.staging.launchpad.net

Commit message

Fix dictionary check for volume_map
Allow non-relation context runs
Fixed unit test for no relation set

Description of the change

Fix dictionary check for volume_map
Allow non-relation context runs

Revision history for this message

Sidnei da Silva (sidnei) wrote on 2013-04-24:

Tried to land it, but it breaks an existing test. I think the test might need adjusting.

review: Needs Fixing

Revision history for this message

David Ames (thedac) wrote on 2013-04-24:

The code attempts to avoid executing realtion-ids with no reltype.

relation-ids with no reltype produces:

root@juju-stagingstack-u1-musicsearch-instance-9:/var/lib/juju/units/u1-msearch-be-1-1/charm# relation-ids
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/usr/lib/juju/juju/juju/hooks/commands.py", line 132, in run
    raise MustSpecifyRelationName()
juju.hooks.protocol.MustSpecifyRelationName: Relation name must be specified
2013-04-24 16:09:31,686 ERROR: Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/twisted/internet/defer.py", line 1039, in _inlineCallbacks
    result = g.send(result)
  File "/usr/lib/juju/juju/juju/hooks/commands.py", line 132, in run
    raise MustSpecifyRelationName()
juju.hooks.protocol.MustSpecifyRelationName: Relation name must be specified

2013-04-24 16:09:31,687 ERROR: [Failure instance: Traceback: <class 'juju.hooks.protocol.MustSpecifyRelationName'>: Relation name must be specified
/usr/lib/python2.7/dist-packages/twisted/internet/defer.py:545:_runCallbacks
/usr/lib/juju/juju/juju/hooks/cli.py:190:_run
/usr/lib/python2.7/dist-packages/twisted/internet/defer.py:134:maybeDeferred
/usr/lib/python2.7/dist-packages/twisted/internet/defer.py:1181:unwindGenerator
--- <exception caught here> ---
/usr/lib/python2.7/dist-packages/twisted/internet/defer.py:1039:_inlineCallbacks
/usr/lib/juju/juju/juju/hooks/commands.py:132:run
]