diff --git a/.zuul.yaml b/.zuul.yaml index 6d0dcf814..ee9dea9f6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -396,6 +396,7 @@ - openstack-lower-constraints-jobs - openstack-python-jobs - openstack-python36-jobs + - openstack-python37-jobs - openstacksdk-functional-tips - openstacksdk-tox-tips - os-client-config-tox-tips diff --git a/openstack/tests/unit/test_resource.py b/openstack/tests/unit/test_resource.py index ee98777f0..7b44a60d3 100644 --- a/openstack/tests/unit/test_resource.py +++ b/openstack/tests/unit/test_resource.py @@ -1901,7 +1901,10 @@ class TestResourceActions(base.TestCase): microversion=None) # Ensure we're done after those three items - self.assertRaises(StopIteration, next, results) + # In python3.7, PEP 479 is enabled for all code, and StopIteration + # raised directly from code is turned into a RuntimeError. + # Something about how mock is implemented triggers that here. + self.assertRaises((StopIteration, RuntimeError), next, results) # Ensure we only made two calls to get this done self.assertEqual(3, len(self.session.get.call_args_list))