From: armando-migliaccio <amigliaccio@nicira.com>
Date: Fri, 13 Sep 2013 14:44:40 +0000 (-0700)
Subject: Stop popen patch correctly in test_agent_linux_utils
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=644f0c64c9c26523965ebb64f44a4dbcd99ae019;p=openstack-build%2Fneutron-build.git

Stop popen patch correctly in test_agent_linux_utils

Fixes bug #1225009

Change-Id: Ic9f3491be2fb7481bbf3fd843a421d66d9248a20
---

diff --git a/neutron/tests/unit/test_agent_linux_utils.py b/neutron/tests/unit/test_agent_linux_utils.py
index 842c8a25f..cccbf2024 100644
--- a/neutron/tests/unit/test_agent_linux_utils.py
+++ b/neutron/tests/unit/test_agent_linux_utils.py
@@ -29,9 +29,9 @@ class AgentUtilsExecuteTest(base.BaseTestCase):
         self.test_file = self.useFixture(
             fixtures.TempDir()).join("test_execute.tmp")
         open(self.test_file, 'w').close()
-        instance = mock.patch("subprocess.Popen.communicate")
-        self.mock_popen = instance.start()
-        self.addCleanup(self.mock_popen.stop)
+        self.mock_popen_p = mock.patch("subprocess.Popen.communicate")
+        self.mock_popen = self.mock_popen_p.start()
+        self.addCleanup(self.mock_popen_p.stop)
 
     def test_without_helper(self):
         expected = "%s\n" % self.test_file