use Executor class for better subprocess calling on server

2 files changed, 27 insertions, 33 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgExternalCommandVerifier.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgExternalCommandVerifier.py
index 0f369113b..7ceedb7c2 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgExternalCommandVerifier.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgExternalCommandVerifier.py
@@ -21,35 +21,32 @@ from TestServer.TestPlugins.TestCfg.Test_init import TestCfgVerifier
 class TestCfgExternalCommandVerifier(TestCfgVerifier):
     test_obj = CfgExternalCommandVerifier
 
-    @patch("Bcfg2.Server.Plugins.Cfg.CfgExternalCommandVerifier.Popen")
-    def test_verify_entry(self, mock_Popen):
-        proc = Mock()
-        mock_Popen.return_value = proc
-        proc.wait.return_value = 0
-        proc.communicate.return_value = ("stdout", "stderr")
+    def test_verify_entry(self):
         entry = lxml.etree.Element("Path", name="/test.txt")
         metadata = Mock()
 
         ecv = self.get_obj()
         ecv.cmd = ["/bin/bash", "-x", "foo"]
+        ecv.exc = Mock()
+        ecv.exc.run.return_value = Mock()
+        ecv.exc.run.return_value.success = True
+
         ecv.verify_entry(entry, metadata, "data")
-        self.assertEqual(mock_Popen.call_args[0], (ecv.cmd,))
-        proc.communicate.assert_called_with(input="data")
-        proc.wait.assert_called_with()
+        ecv.exc.run.assert_called_with(ecv.cmd, inputdata="data")
 
-        mock_Popen.reset_mock()
-        proc.wait.return_value = 13
+        ecv.exc.reset_mock()
+        ecv.exc.run.return_value.success = False
         self.assertRaises(CfgVerificationError,
                           ecv.verify_entry, entry, metadata, "data")
-        self.assertEqual(mock_Popen.call_args[0], (ecv.cmd,))
-        proc.communicate.assert_called_with(input="data")
-        proc.wait.assert_called_with()
+        ecv.exc.run.assert_called_with(ecv.cmd, inputdata="data")
+
+        ecv.exc.reset_mock()
 
-        mock_Popen.reset_mock()
-        mock_Popen.side_effect = OSError
+        ecv.exc.reset_mock()
+        ecv.exc.run.side_effect = OSError
         self.assertRaises(CfgVerificationError,
                           ecv.verify_entry, entry, metadata, "data")
-        self.assertEqual(mock_Popen.call_args[0], (ecv.cmd,))
+        ecv.exc.run.assert_called_with(ecv.cmd, inputdata="data")
 
     @patch("os.access")
     def test_handle_event(self, mock_access):
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
index 2982825a9..6cfd2f666 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
@@ -98,24 +98,23 @@ class TestCfgPrivateKeyCreator(TestCfgCreator, TestStructFile):
 
     @patch("shutil.rmtree")
     @patch("tempfile.mkdtemp")
-    @patch("subprocess.Popen")
-    def test__gen_keypair(self, mock_Popen, mock_mkdtemp, mock_rmtree):
+    def test__gen_keypair(self, mock_mkdtemp, mock_rmtree):
         pkc = self.get_obj()
+        pkc.cmd = Mock()
         pkc.XMLMatch = Mock()
         mock_mkdtemp.return_value = datastore
         metadata = Mock()
 
-        proc = Mock()
-        proc.wait.return_value = 0
-        proc.communicate.return_value = MagicMock()
-        mock_Popen.return_value = proc
+        exc = Mock()
+        exc.success = True
+        pkc.cmd.run.return_value = exc
 
         spec = lxml.etree.Element("PrivateKey")
         pkc.XMLMatch.return_value = spec
 
         def reset():
             pkc.XMLMatch.reset_mock()
-            mock_Popen.reset_mock()
+            pkc.cmd.reset_mock()
             mock_mkdtemp.reset_mock()
             mock_rmtree.reset_mock()
 
@@ -123,10 +122,9 @@ class TestCfgPrivateKeyCreator(TestCfgCreator, TestStructFile):
                          os.path.join(datastore, "privkey"))
         pkc.XMLMatch.assert_called_with(metadata)
         mock_mkdtemp.assert_called_with()
-        self.assertItemsEqual(mock_Popen.call_args[0][0],
-                              ["ssh-keygen", "-f",
-                               os.path.join(datastore, "privkey"),
-                               "-t", "rsa", "-N", ""])
+        pkc.cmd.run.assert_called_with(["ssh-keygen", "-f",
+                                        os.path.join(datastore, "privkey"),
+                                        "-t", "rsa", "-N", ""])
 
         reset()
         lxml.etree.SubElement(spec, "Params", bits="768", type="dsa")
@@ -137,13 +135,12 @@ class TestCfgPrivateKeyCreator(TestCfgCreator, TestStructFile):
                          os.path.join(datastore, "privkey"))
         pkc.XMLMatch.assert_called_with(metadata)
         mock_mkdtemp.assert_called_with()
-        self.assertItemsEqual(mock_Popen.call_args[0][0],
-                              ["ssh-keygen", "-f",
-                               os.path.join(datastore, "privkey"),
-                               "-t", "dsa", "-b", "768", "-N", "foo"])
+        pkc.cmd.run.assert_called_with(["ssh-keygen", "-f",
+                                        os.path.join(datastore, "privkey"),
+                                        "-t", "dsa", "-b", "768", "-N", "foo"])
 
         reset()
-        proc.wait.return_value = 1
+        pkc.cmd.run.return_value.success = False
         self.assertRaises(CfgCreationError, pkc._gen_keypair, metadata)
         mock_rmtree.assert_called_with(datastore)