Merge "Port loadbalancers tests to Python 3"
This commit is contained in:
commit
555865065a
|
@ -14,7 +14,6 @@ from mox3.mox import IgnoreArg # noqa
|
||||||
from mox3.mox import IsA # noqa
|
from mox3.mox import IsA # noqa
|
||||||
|
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.core.urlresolvers import reverse_lazy
|
|
||||||
from django import http
|
from django import http
|
||||||
|
|
||||||
from horizon.workflows import views
|
from horizon.workflows import views
|
||||||
|
@ -34,7 +33,7 @@ class LoadBalancerTests(test.TestCase):
|
||||||
self[attr] = value
|
self[attr] = value
|
||||||
|
|
||||||
DASHBOARD = 'project'
|
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
|
ADDPOOL_PATH = 'horizon:%s:loadbalancers:addpool' % DASHBOARD
|
||||||
ADDVIP_PATH = 'horizon:%s:loadbalancers:addvip' % DASHBOARD
|
ADDVIP_PATH = 'horizon:%s:loadbalancers:addvip' % DASHBOARD
|
||||||
|
|
|
@ -546,7 +546,7 @@ class AddMonitorAction(workflows.Action):
|
||||||
delay = cleaned_data.get('delay')
|
delay = cleaned_data.get('delay')
|
||||||
timeout = cleaned_data.get('timeout')
|
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')
|
msg = _('Delay must be greater than or equal to Timeout')
|
||||||
self._errors['delay'] = self.error_class([msg])
|
self._errors['delay'] = self.error_class([msg])
|
||||||
|
|
||||||
|
|
1
tox.ini
1
tox.ini
|
@ -33,6 +33,7 @@ commands =
|
||||||
openstack_dashboard.dashboards.project.access_and_security.api_access.tests \
|
openstack_dashboard.dashboards.project.access_and_security.api_access.tests \
|
||||||
openstack_dashboard.dashboards.project.images \
|
openstack_dashboard.dashboards.project.images \
|
||||||
openstack_dashboard.dashboards.project.instances \
|
openstack_dashboard.dashboards.project.instances \
|
||||||
|
openstack_dashboard.dashboards.project.loadbalancers \
|
||||||
openstack_dashboard.dashboards.project.network_topology \
|
openstack_dashboard.dashboards.project.network_topology \
|
||||||
openstack_dashboard.dashboards.project.networks.tests \
|
openstack_dashboard.dashboards.project.networks.tests \
|
||||||
openstack_dashboard.dashboards.project.overview.tests \
|
openstack_dashboard.dashboards.project.overview.tests \
|
||||||
|
|
Loading…
Reference in New Issue