From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 13 Dec 2014 04:32:32 +0000 (+0000)
Subject: Merge "Separate wait_until to standalone function"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b36a856441da697aed67847f5010155c0885e8f5;p=openstack-build%2Fneutron-build.git

Merge "Separate wait_until to standalone function"
---

b36a856441da697aed67847f5010155c0885e8f5
diff --cc neutron/tests/functional/base.py
index 7d43b0715,fe25535fa..cb2fc376f
--- a/neutron/tests/functional/base.py
+++ b/neutron/tests/functional/base.py
@@@ -14,16 -14,11 +14,13 @@@
  #    under the License.
  
  import os
- import time
  
 -from neutron.tests import base
 +from oslo.config import cfg
  
 +from neutron.agent.common import config
 +from neutron.tests import base
  
  SUDO_CMD = 'sudo -n'
- TIMEOUT = 60
- SLEEP_INTERVAL = 1
  
  
  class BaseSudoTestCase(base.BaseTestCase):