Merge lp:~thedac/charmsupport/volume-management into lp:~ubuntuone-pqm-team/charmsupport/trunk

[Sidnei da Silva]

Fix dictionary check for volume_map
Allow non-relation context runs

Fix dictionary check for volume_map
Allow non-relation context runs

[Sidnei da Silva (sidnei)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~thedac/charmsupport/volume-management into lp:~ubuntuone-pqm-team/charmsupport/trunk failed. Below is the output from the failed tests.

Starting tests...

...........................F...................................................
======================================================================
FAIL: tests.test_hookenv.HelpersTest.test_relation_ids_no_relation_type
----------------------------------------------------------------------
_StringException: Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1190, in patched
    return func(*args, **keywargs)
  File "/mnt/tarmac/cache/charmsupport/trunk/tests/test_hookenv.py", line 175, in test_relation_ids_no_relation_type
    self.assertEqual(result, ids)
MismatchError: [] != [1, 2, 3]

Name Stmts Miss Cover Missing
----------------------------------------------------
charmsupport 0 0 100%
charmsupport.hookenv 140 11 92% 41, 45, 49-50, 125-130, 180
charmsupport.host 112 2 98% 163, 177
charmsupport.nrpe 83 2 98% 197-198
----------------------------------------------------
TOTAL 335 15 96%
----------------------------------------------------------------------
Ran 79 tests in 0.272s

FAILED (failures=1)
make: *** [test] Error 1

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    ubuntuone-hackers

Unaccepted Authors:

    Anthony Lenton <email address hidden>

=== modified file 'charmsupport/hookenv.py'
--- charmsupport/hookenv.py	2013-04-03 02:16:23 +0000
+++ charmsupport/hookenv.py	2013-04-24 17:47:34 +0000
@@ -136,7 +136,9 @@
     relid_cmd_line = ['relation-ids', '--format=json']
     if reltype is not None:
         relid_cmd_line.append(reltype)
-    return json.loads(subprocess.check_output(relid_cmd_line))
+        return json.loads(subprocess.check_output(relid_cmd_line))
+    else:
+        return []
 
 
 def related_units(relid=None):
@@ -174,6 +176,8 @@
     "Get relations of a specific type"
     relation_data = []
     reltype = reltype or relation_type()
+    if reltype is None:
+        return []
     for relid in relation_ids(reltype):
         for relation in relations_for_id(relid):
             relation['__relid__'] = relid

=== modified file 'charmsupport/volumes.py'
--- charmsupport/volumes.py	2013-02-07 21:43:31 +0000
+++ charmsupport/volumes.py	2013-04-24 17:47:34 +0000
@@ -74,7 +74,7 @@
     if volume_map is None:
         # probably an empty string
         volume_map = {}
-    elif isinstance(volume_map, dict):
+    elif not isinstance(volume_map, dict):
         hookenv.log("Volume-map should be a dictionary, not {}".format(
             type(volume_map)))
         errors = True

=== modified file 'tests/test_hookenv.py'
--- tests/test_hookenv.py	2013-04-03 02:16:23 +0000
+++ tests/test_hookenv.py	2013-04-24 17:47:34 +0000
@@ -166,14 +166,12 @@
     @patch('subprocess.check_output')
     @patch('charmsupport.hookenv.relation_type')
     def test_relation_ids_no_relation_type(self, relation_type, check_output):
-        ids = [1, 2, 3]
-        check_output.return_value = json.dumps(ids)
         relation_type.return_value = None
 
         result = hookenv.relation_ids()
 
-        self.assertEqual(result, ids)
-        check_output.assert_called_with(['relation-ids', '--format=json'])
+        self.assertEqual([], result)
+        check_output.assert_not_called()
 
     @patch('subprocess.check_output')
     @patch('charmsupport.hookenv.relation_type')