Merge branch 'master' of git://github.com/juju/python-libjuju into merge-2.9-master

Author: SimonRichardson

juju/bundle.py

@@ -434,9 +434,9 @@ async def run(self, context):
         if self.charm.startswith('local:'):
             return self.charm
 
-        entity_id = await context.charmstore.entityId(self.charm)
+        entity_id = await context.charmstore.entityId(self.charm, channel=self.channel)
         log.debug('Adding %s', entity_id)
-        await context.client_facade.AddCharm(channel=None, url=entity_id, force=False)
+        await context.client_facade.AddCharm(channel=self.channel, url=entity_id, force=False)
         return entity_id
 
     def __str__(self):

tests/unit/test_bundle.py

@@ -303,10 +303,10 @@ async def test_run(self, event_loop):
         assert result == "entity_id"
 
         charmstore.entityId.assert_called_once()
-        charmstore.entityId.assert_called_with("charm")
+        charmstore.entityId.assert_called_with("charm", channel="channel")
 
         client_facade.AddCharm.assert_called_once()
-        client_facade.AddCharm.assert_called_with(channel=None,
+        client_facade.AddCharm.assert_called_with(channel="channel",
                                                   url="entity_id",
                                                   force=False)