Revert "remote_access: enforce shell=True on shell commands"
This reverts commit 2415126c2943b21af0d9a25e2e640b4359406bfd.
2/2
BUG=chromium:776099
Change-Id: I7c13bc56398cc204afbc35eef898ce7f6f36f90d
Reviewed-on: https://chromium-review.googlesource.com/734981
Reviewed-by: Richard Barnette <jrbarnette@google.com>
Tested-by: David Haddock <dhaddock@chromium.org>
Trybot-Ready: David Haddock <dhaddock@chromium.org>
diff --git a/scripts/deploy_chrome_unittest.py b/scripts/deploy_chrome_unittest.py
index c7c6731..872ed8e 100644
--- a/scripts/deploy_chrome_unittest.py
+++ b/scripts/deploy_chrome_unittest.py
@@ -103,7 +103,8 @@
self.rsh_mock = remote_access_unittest.RemoteShMock()
self.rsh_mock.SetDefaultCmdResult(0)
self.MockMountCmd(1)
- self.rsh_mock.AddCmdResult(['lsof', deploy_chrome._CHROME_DIR], 1)
+ self.rsh_mock.AddCmdResult(
+ deploy_chrome.LSOF_COMMAND % (deploy_chrome._CHROME_DIR,), 1)
def MockMountCmd(self, returnvalue):
self.rsh_mock.AddCmdResult(deploy_chrome.MOUNT_RW_COMMAND,
@@ -200,7 +201,7 @@
"""Test detection of a running 'ui' job."""
def MockStatusUiCmd(self, **kwargs):
- self.deploy_mock.rsh_mock.AddCmdResult(['status', 'ui'], **kwargs)
+ self.deploy_mock.rsh_mock.AddCmdResult('status ui', **kwargs)
def testUiJobStartedFalse(self):
"""Correct results with a stopped job."""