master: Fix mark_popular_plugins crashing when Wordpres API returned …

…plugins in a dict instead of a list
delvelabs · Apr 4, 2018 · 8b3d9e3 · 8b3d9e3
1 parent 8aba13c
commit 8b3d9e3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/openwebvulndb/wordpress/repository.py b/openwebvulndb/wordpress/repository.py
@@ -95,7 +95,8 @@ async def _mark_popular_from_api(self, group, count):
                                           '?action=query_{group}&request[browse]=popular&request[per_page]={count}'.
                                           format(group=group, count=count)) as response:
             data = await response.json()
-            for entry in data[group]:
+            entries = data[group].values() if type(data[group]) == dict else data[group]
+            for entry in entries:
                 slug = "{group}/{partial}".format(group=group, partial=entry["slug"])
                 try:
                     meta = self.storage.read_meta(slug)

diff --git a/tests/wordpress_test/enumerate_plugins_test.py b/tests/wordpress_test/enumerate_plugins_test.py
@@ -200,7 +200,7 @@ async def test_flag_as_popular_from_api(self, loop):
         handler.storage.read_meta.assert_has_calls([
             call("plugins/woocommerce"),
             call("plugins/google-sitemap-generator"),
-        ])
+        ], any_order=True)
         self.assertTrue(meta_1.is_popular)
         self.assertTrue(meta_2.is_popular)
         self.assertIsNone(meta_3.is_popular)