Merge lp:~sidnei/charmsupport/fix-relations-for-id into lp:charmsupport

[Sidnei da Silva]

Fix relations_for_id to use relation_id not relation_ids.

Fix relations_for_id to use relation_id not relation_ids.

[Matthew Wedgwood (mew)]

lgtm

review: Approve

=== modified file 'charmsupport/hookenv.py'
--- charmsupport/hookenv.py	2013-05-06 17:30:18 +0000
+++ charmsupport/hookenv.py	2013-05-10 22:19:25 +0000
@@ -167,7 +167,7 @@
 def relations_for_id(relid=None):
     "Get relations of a specific relation ID"
     relation_data = []
-    relid = relid or relation_ids()
+    relid = relid or relation_id()
     for unit in related_units(relid):
         unit_data = relation_for_unit(unit, relid)
         unit_data['__relid__'] = relid

=== modified file 'tests/test_hookenv.py'
--- tests/test_hookenv.py	2013-04-24 17:45:30 +0000
+++ tests/test_hookenv.py	2013-05-10 22:19:25 +0000
@@ -269,18 +269,18 @@
         relation_get.assert_called_with(unit=unit, rid=None)
         self.assertFalse(remote_unit.called)
 
-    @patch('charmsupport.hookenv.relation_ids')
+    @patch('charmsupport.hookenv.relation_id')
     @patch('charmsupport.hookenv.related_units')
     @patch('charmsupport.hookenv.relation_for_unit')
     def test_gets_relations_for_id(self, relation_for_unit, related_units,
-                                   relation_ids):
+                                   relation_id):
         relid = 123
         units = ['foo', 'bar']
         unit_data = [
             {'foo-item': 'bar-item'},
             {'foo-item2': 'bar-item2'},
         ]
-        relation_ids.return_value = relid
+        relation_id.return_value = relid
         related_units.return_value = units
         relation_for_unit.side_effect = unit_data