From: Eugene Nikanorov Date: Wed, 12 Mar 2014 08:35:45 +0000 (+0400) Subject: Fix unittest failure in radware lbaas driver X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=21aa7e3f78094837ca63d3742459c7a8d011c9dd;p=openstack-build%2Fneutron-build.git Fix unittest failure in radware lbaas driver Wait for vip delete completion before deleting network and subnet. Also fix indentation in the driver Closes-Bug: #1288312 Change-Id: I88b3252102d6c4a60bbadf2951bbb74fcd19792b --- diff --git a/neutron/services/loadbalancer/drivers/radware/driver.py b/neutron/services/loadbalancer/drivers/radware/driver.py index e639d0adf..dae5d1445 100644 --- a/neutron/services/loadbalancer/drivers/radware/driver.py +++ b/neutron/services/loadbalancer/drivers/radware/driver.py @@ -651,8 +651,8 @@ class OperationCompletionHandler(threading.Thread): LOG.debug('Operation consumed from the queue: ' + str(oper)) - # check the status - if oper is done: update the db , - # else push the oper again to the queue + # check the status - if oper is done: update the db , + # else push the oper again to the queue result = self.rest_client.call('GET', oper.operation_url, None, diff --git a/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py b/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py index 1c0bf1f71..bdcfc805e 100644 --- a/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py +++ b/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py @@ -232,8 +232,8 @@ class TestLoadBalancerPlugin(TestLoadBalancerPluginBase): None, None) ] self.rest_call_mock.assert_has_calls(calls, any_order=True) - # need to switch greenthreads in order to let driver delete vip - eventlet.greenthread.sleep(0) + # need to wait some time to allow driver to delete vip + eventlet.greenthread.sleep(1) def test_update_vip(self): self.rest_call_mock.reset_mock()