[airflow] branch v1-10-test updated: fixup! Make loading plugins from entrypoint fault-tolerant (#8732)

[kaxilnaik]

This is an automated email from the ASF dual-hosted git repository.

kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/v1-10-test by this push:
     new 23af3a7  fixup! Make loading plugins from entrypoint fault-tolerant 
(#8732)
23af3a7 is described below

commit 23af3a78546e71b2fbadbd3c6971c87dc843b50f
Author: Kaxil Naik <kaxiln...@gmail.com>
AuthorDate: Fri Jun 26 21:07:53 2020 +0100

    fixup! Make loading plugins from entrypoint fault-tolerant (#8732)
---
 tests/plugins/test_plugins_manager_rbac.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/plugins/test_plugins_manager_rbac.py 
b/tests/plugins/test_plugins_manager_rbac.py
index 3ec61be..83edcb6 100644
--- a/tests/plugins/test_plugins_manager_rbac.py
+++ b/tests/plugins/test_plugins_manager_rbac.py
@@ -23,6 +23,7 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 import unittest
+import six
 from tests.compat import mock
 
 import pkg_resources
@@ -74,6 +75,7 @@ class PluginsTestRBAC(unittest.TestCase):
         self.assertTrue('test_plugin' in self.app.blueprints)
         self.assertEqual(self.app.blueprints['test_plugin'].name, bp.name)
 
+    @unittest.skipIf(six.PY2, 'self.assertLogs not available for Python 2')
     @mock.patch('pkg_resources.iter_entry_points')
     def test_entrypoint_plugin_errors_dont_raise_exceptions(self, 
mock_ep_plugins):
         """