Update charmhub info test

Author: cderici

juju/charmhub.py

@@ -74,17 +74,20 @@ async def info(self, name, channel=None):
             if err_code:
                 raise JujuError(f'charmhub.info - {err_code} : {res.errors.error_list.message}')
             result = res.result
-            result.channel_map = self._channel_map_to_dict(result.channel_map)
+            result.channel_map = CharmHub._channel_map_to_dict(
+                result.channel_map)
             result = result.serialize()
         else:
             charmhub_url = await self._charmhub_url()
             url = "{}/v2/charms/info/{}?fields=channel-map".format(
                 charmhub_url.value, name)
             _response = self.request_charmhub_with_retry(url, 5)
             result = json.loads(_response.text)
+            result['channel-map'] = CharmHub._channel_list_to_map(result['channel-map'])
         return result
 
-    def _channel_list_to_map(self, channel_list_map):
+    @staticmethod
+    def _channel_list_to_map(channel_list_map):
         """Charmhub API returns the channel map as a list of channel objects
         (with risk, track, revision, download etc). This turns that into a map
         that's keyed with the channel=track/risk for easy
@@ -106,7 +109,8 @@ def _channel_list_to_map(self, channel_list_map):
                 = ch
         return channel_map
 
-    def _channel_map_to_dict(self, channel_map):
+    @staticmethod
+    def _channel_map_to_dict(channel_map):
         """Converts the client.definitions.Channel objects into python maps
         inside a channel map (for pylibjuju <3.0)
 

tests/integration/test_charmhub.py

@@ -12,6 +12,20 @@ async def test_info(event_loop):
         _, name = await model.charmhub.get_charm_id("hello-juju")
         assert name == "hello-juju"
 
+        charm_name = 'juju-qa-test'
+        charm_info = await model.charmhub.info(charm_name)
+        assert charm_info['name'] == 'juju-qa-test'
+        assert charm_info['type'] == 'charm'
+        assert charm_info['id'] == 'Hw30RWzpUBnJLGtO71SX8VDWvd3WrjaJ'
+        assert '2.0/stable' in charm_info['channel-map']
+        cm_rev = charm_info['channel-map']['2.0/stable']['revision']
+        if type(cm_rev) == dict:
+            # New client (>= 3.0)
+            assert cm_rev['revision'] == 22
+        else:
+            # Old client (<= 2.9)
+            assert cm_rev == 22
+
 
 @base.bootstrapped
 @pytest.mark.asyncio