openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Add a whitelist of tests passing on Python 3"

This commit is contained in:
Jenkins 2016-03-23 16:39:29 +00:00 committed by Gerrit Code Review
parent 3a3bee9c78 c1718c6ccf
commit bfd5c71531
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_lbaas/services/loadbalancer/agent_scheduler.py
View File

@ -153,7 +153,7 @@ class LeastPoolAgentScheduler(SchedulerBase):
def _schedule(self, candidates, plugin, context):
"""Pick an agent with least number of pools from candidates"""
current_min_pool_num = sys.maxint
current_min_pool_num = sys.maxsize
# SchedulerBase.schedule() already checks for empty candidates
for tmp_agent in candidates:
tmp_pool_num = plugin.num_of_pools_on_lbaas_agent(

5
tests-py3.txt Normal file
View File

@ -0,0 +1,5 @@
neutron_lbaas.tests.unit.common.cert_manager.barbican_auth.test_barbican_acl
neutron_lbaas.tests.unit.common.cert_manager.test_barbican
neutron_lbaas.tests.unit.common.cert_manager.test_local
neutron_lbaas.tests.unit.services.loadbalancer.test_agent_scheduler
neutron_lbaas.tests.unit.services.loadbalancer.test_loadbalancer_plugin

3
tox.ini
View File

@ -47,8 +47,7 @@ commands = {posargs}
commands = python setup.py build_sphinx
[testenv:py34]
commands = python -m testtools.run \
neutron_lbaas.tests.unit.common.cert_manager.test_barbican
commands = ostestr --whitelist_file=tests-py3.txt
[flake8]
# E125 continuation line does not distinguish itself from next logical line