Skip to content

Commit 5768597

Browse files
committed
Fix issues with upstream jobs
setuptools version is pinned to 70.3.0 to resolve an issue related to this ticket: pypa/setuptools#4483 pylint version is forced to >=3.3.0, where max-positional-arguments functionality has been added and max-positional-arguments is set to 16: pylint-dev/pylint#9842 Changes in functional test test_stateless_sec_group_list_find because sec group lists from a sec group can be ordered differently each time a request is sent to obtain them. Changed custom_mtu_size default value from 1350 to 1300 because some tests started failing on some jobs with: "Requested MTU is too big, maximum is 1314" Change-Id: Ie92d9a2f4e0dd08aeadfd720bdf4963b532decf3
1 parent 859ce18 commit 5768597

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

.pylintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,9 @@ ignored-parents=
845845
# Maximum number of arguments for function / method.
846846
max-args=5
847847

848+
# Maximum number of positional arguments for function / method (default=5.)
849+
max-positional-arguments = 16
850+
848851
# Maximum number of attributes for a class (see R0902).
849852
max-attributes=7
850853

linters-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# pep8 and flake8 requirements
22

33
pre-commit >= 2.16.0 # MIT
4-
pylint>=2.5.3 # GPL2
4+
pylint>=3.3.0 # GPL2

tobiko/openstack/neutron/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
default=None,
4747
help="List of nameservers IPv6 addresses"),
4848
cfg.IntOpt('custom_mtu_size',
49-
default=1350,
49+
default=1300,
5050
help=("Customized maximum transfer unit size\n"
5151
"Notes:\n"
5252
" - MTU values as small as 1000 has been seen "

tobiko/tests/functional/openstack/neutron/test_security_group.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,17 @@ def test_stateless_sec_group_list_find(self):
5454
f"{StatelessSecurityGroupFixture.__qualname__}-{i}")
5555
self.assertEqual(ssg_name, ssg_fixture.name)
5656
ssg = neutron.list_security_groups(name=ssg_name).unique
57-
self.assertEqual(ssg, ssg_fixture.security_group)
57+
self.assertCountEqual(ssg.keys(),
58+
ssg_fixture.security_group.keys())
59+
for k in ssg.keys():
60+
if k != 'security_group_rules':
61+
self.assertEqual(ssg[k], ssg_fixture.security_group[k])
62+
else:
63+
# the elements from the lists ssg['security_group_rules']
64+
# and ssg_fixture.security_group['security_group_rules']
65+
# are equal, but they could be ordered in a different way
66+
self.assertCountEqual(ssg[k],
67+
ssg_fixture.security_group[k])
5868

5969
def test_stateless_sec_group_list_parameters(self):
6070
for i, ssg_fixture in enumerate(self.ssg_fixture_list):

upper-constraints.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@ sentinels===1.0.0
434434
seqdiag===3.0.0;python_version=='3.8'
435435
setproctitle===1.2.2
436436
setuptools===60.9.3;python_version=='3.8'
437+
setuptools===70.3.0;python_version>='3.9'
437438
simplegeneric===0.8.1
438439
simplejson===3.17.6
439440
six===1.16.0

0 commit comments

Comments
 (0)