Bug 902645 - Use root to create android xpcshell xpcb directory; r=jmaher

This commit is contained in:
Geoff Brown 2013-08-15 17:06:01 -07:00
parent 91426ae90f
commit d5a95f185e

View File

@ -294,7 +294,12 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
def setupUtilities(self): def setupUtilities(self):
if (not self.device.dirExists(self.remoteBinDir)): if (not self.device.dirExists(self.remoteBinDir)):
# device.mkDir may fail here where shellCheckOutput may succeed -- see bug 817235 # device.mkDir may fail here where shellCheckOutput may succeed -- see bug 817235
self.device.shellCheckOutput(["mkdir", self.remoteBinDir]); try:
self.device.shellCheckOutput(["mkdir", self.remoteBinDir]);
except devicemanager.DMError:
# Might get a permission error; try again as root, if available
self.device.shellCheckOutput(["mkdir", self.remoteBinDir], root=True);
self.device.shellCheckOutput(["chmod", "777", self.remoteBinDir], root=True);
remotePrefDir = remoteJoin(self.remoteBinDir, "defaults/pref") remotePrefDir = remoteJoin(self.remoteBinDir, "defaults/pref")
if (self.device.dirExists(self.remoteTmpDir)): if (self.device.dirExists(self.remoteTmpDir)):