diff --git a/test/ganeti.utils_unittest.py b/test/ganeti.utils_unittest.py index 7165498c3af5dee1fccb7482e304d2474ce118c6..ef11e8ed0f29a26e053862ff75b9307c751f70ec 100755 --- a/test/ganeti.utils_unittest.py +++ b/test/ganeti.utils_unittest.py @@ -296,10 +296,9 @@ class TestRunCmd(testutils.GanetiTestCase): self.assertEqual(result.exit_code, 0) def testTimeoutKill(self): - cmd = "trap '' TERM; read < %s" % self.fifo_file + cmd = ["/bin/sh", "-c", "trap '' TERM; read < %s" % self.fifo_file] timeout = 0.2 - strcmd = utils.ShellQuoteArgs(["/bin/sh", "-c", cmd]) - out, err, status, ta = utils._RunCmdPipe(strcmd, {}, True, "/", False, + out, err, status, ta = utils._RunCmdPipe(cmd, {}, False, "/", False, timeout, _linger_timeout=0.2) self.assert_(status < 0) self.assertEqual(-status, signal.SIGKILL)