openstack
/
horizon
Code Issues Proposed changes

Merge "Port loadbalancers tests to Python 3"

This commit is contained in:
Jenkins 2016-01-28 18:47:46 +00:00 committed by Gerrit Code Review
parent 0c6c7ff105 b1df7d1389
commit 555865065a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/project/loadbalancers/tests.py
View File

@ -14,7 +14,6 @@ from mox3.mox import IgnoreArg # noqa
from mox3.mox import IsA # noqa
from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
from django import http
from horizon.workflows import views
@ -34,7 +33,7 @@ class LoadBalancerTests(test.TestCase):
self[attr] = value
DASHBOARD = 'project'
INDEX_URL = reverse_lazy('horizon:%s:loadbalancers:index' % DASHBOARD)
INDEX_URL = reverse('horizon:%s:loadbalancers:index' % DASHBOARD)
ADDPOOL_PATH = 'horizon:%s:loadbalancers:addpool' % DASHBOARD
ADDVIP_PATH = 'horizon:%s:loadbalancers:addvip' % DASHBOARD

2
openstack_dashboard/dashboards/project/loadbalancers/workflows.py
View File

@ -546,7 +546,7 @@ class AddMonitorAction(workflows.Action):
delay = cleaned_data.get('delay')
timeout = cleaned_data.get('timeout')
if not delay >= timeout:
if (delay is None) or (delay < timeout):
msg = _('Delay must be greater than or equal to Timeout')
self._errors['delay'] = self.error_class([msg])

1
tox.ini
View File

@ -33,6 +33,7 @@ commands =
openstack_dashboard.dashboards.project.access_and_security.api_access.tests \
openstack_dashboard.dashboards.project.images \
openstack_dashboard.dashboards.project.instances \
openstack_dashboard.dashboards.project.loadbalancers \
openstack_dashboard.dashboards.project.network_topology \
openstack_dashboard.dashboards.project.networks.tests \
openstack_dashboard.dashboards.project.overview.tests \