Merge "Separate wait_until to standalone function"

diff --cc neutron/tests/functional/agent/test_l3_agent.py
Simple merge

diff --cc neutron/tests/functional/base.py
index 7d43b0715d1122a37a437f75f5c72a2677b3b2fb,fe25535fa92bf83c41a29a719ad792d2acf2e7ba..cb2fc376ff7fd243deef0b77e04f8e5f97175e9c
--- 1/neutron/tests/functional/base.py
--- 2/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):