Merge "Upgrade flake8-import-order version to 0.17.1"

functest-requirements.txt

@@ -1,4 +1,4 @@
 # NOTE(jroll) these are pinned to the same SHA, update when needed.
 # Last updated: Apr 2, 2020 (Ussuri cycle).
-git+https://opendev.org/openstack/ironic-inspector@75437072da66686509d4b7fa80589f5b4966a858#egg=ironic-inspector
--r https://opendev.org/openstack/ironic-inspector/raw/commit/75437072da66686509d4b7fa80589f5b4966a858/test-requirements.txt
+git+https://opendev.org/openstack/ironic-inspector@1299bdc3223a213634fbcd6e423c99044c004ce5#egg=ironic-inspector
+-r https://opendev.org/openstack/ironic-inspector/raw/commit/1299bdc3223a213634fbcd6e423c99044c004ce5/test-requirements.txt

ironic_inspector_client/test/functional.py

@@ -210,6 +210,7 @@ class TestV1PythonAPI(functional.Base):
         rule = {'conditions': [],
                 'actions': [{'action': 'fail', 'message': 'boom'}],
                 'description': 'Cool actions',
+                'scope': None,
                 'uuid': self.uuid}
         res = self.client.rules.from_json(rule)
         self.assertEqual(self.uuid, res['uuid'])
@@ -222,7 +223,8 @@ class TestV1PythonAPI(functional.Base):
         res = self.client.rules.get_all()
         self.assertEqual(rule['links'], res[0].pop('links'))
         self.assertEqual([{'uuid': self.uuid,
-                           'description': 'Cool actions'}],
+                           'description': 'Cool actions',
+                           'scope': None}],
                          res)
 
         self.client.rules.delete(self.uuid)
@@ -357,13 +359,15 @@ class TestCLI(BaseCLITest):
         rule = {'conditions': [],
                 'actions': [{'action': 'fail', 'message': 'boom'}],
                 'description': 'Cool actions',
+                'scope': None,
                 'uuid': self.uuid}
         with tempfile.NamedTemporaryFile(mode='w') as fp:
             json.dump(rule, fp)
             fp.flush()
             res = self.run_cli('rule', 'import', fp.name, parse_json=True)
 
-        self.assertEqual([{'UUID': self.uuid, 'Description': 'Cool actions'}],
+        self.assertEqual([{'UUID': self.uuid,
+                           'Description': 'Cool actions'}],
                          res)
 
         res = self.run_cli('rule', 'show', self.uuid, parse_json=True)

lower-constraints.txt

@@ -19,6 +19,7 @@ extras==1.0.0
 fasteners==0.7.0
 fixtures==3.0.0
 flake8==2.5.5
+flake8-import-order==0.17.1
 hacking==3.0.0
 idna==2.6
 imagesize==0.7.1

test-requirements.txt

@@ -4,7 +4,7 @@
 coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-flake8-import-order>=0.13 # LGPLv3
+flake8-import-order>=0.17.1 # LGPLv3
 hacking>=3.0.0,<3.1.0 # Apache-2.0
 mock>=2.0.0 # BSD
 requests-mock>=1.2.0 # Apache-2.0