From: Sean McCully <sean_mccully@yahoo.com>
Date: Thu, 26 Sep 2013 03:56:34 +0000 (-0500)
Subject: fixes test_kill_pids_in_file conflicts
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0d388b4effa059bd417024854d0c90f7ecf4c82c;p=openstack-build%2Fneutron-build.git

fixes test_kill_pids_in_file conflicts

Fixes Bug: #1231246
Change-Id: Ibedd59d6570cd8d5020e99125c6808d5d2170851
---

diff --git a/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py b/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py
index 3e39b0bd2..78a45f5fc 100644
--- a/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py
+++ b/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py
@@ -284,8 +284,9 @@ class TestHaproxyNSDriver(base.BaseTestCase):
         with contextlib.nested(
             mock.patch('os.path.exists'),
             mock.patch('__builtin__.open'),
-            mock.patch('neutron.agent.linux.utils.execute')
-        ) as (path_exists, mock_open, mock_execute):
+            mock.patch('neutron.agent.linux.utils.execute'),
+            mock.patch.object(namespace_driver.LOG, 'exception'),
+        ) as (path_exists, mock_open, mock_execute, mock_log):
             file_mock = mock.MagicMock()
             mock_open.return_value = file_mock
             file_mock.__enter__.return_value = file_mock
@@ -300,6 +301,7 @@ class TestHaproxyNSDriver(base.BaseTestCase):
             path_exists.return_value = True
             mock_execute.side_effect = RuntimeError
             namespace_driver.kill_pids_in_file('sudo', 'test_path')
+            self.assertTrue(mock_log.called)
             mock_execute.assert_called_once_with(
                 ['kill', '-9', '123'], 'sudo')