From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 14 Dec 2015 14:57:56 +0000 (+0000)
Subject: Merge "Skip keepalived_respawns test"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cdd2d6c07db154c6a4cb59903cb2e01ec58be3db;p=openstack-build%2Fneutron-build.git

Merge "Skip keepalived_respawns test"
---

cdd2d6c07db154c6a4cb59903cb2e01ec58be3db
diff --cc neutron/tests/functional/agent/linux/test_keepalived.py
index 08ee3d2f1,9b13cc9ac..d58f364ca
--- a/neutron/tests/functional/agent/linux/test_keepalived.py
+++ b/neutron/tests/functional/agent/linux/test_keepalived.py
@@@ -13,10 -13,13 +13,14 @@@
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
+ from distutils import version
+ import re
+ 
  from oslo_config import cfg
  from oslo_log import log as logging
+ import testtools
  
 +from neutron._i18n import _
  from neutron.agent.linux import external_process
  from neutron.agent.linux import keepalived
  from neutron.agent.linux import utils