wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 979231 - DeviceManager ADB pushDir should take a timeout parameter and make use of it. r=dminor

Browse Source
This commit is contained in:
Douglas Crosher 2014-03-04 22:55:21 +11:00
parent b5810fcf72
commit 248e53743b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py
View File

@ -207,7 +207,7 @@ class DeviceManagerADB(DeviceManager):
if 'read-only file system' in result.lower():
raise DMError("Error creating directory: read only file system")
def pushDir(self, localDir, remoteDir, retryLimit=None):
def pushDir(self, localDir, remoteDir, retryLimit=None, timeout=None):
# adb "push" accepts a directory as an argument, but if the directory
# contains symbolic links, the links are pushed, rather than the linked
# files; we either zip/unzip or re-copy the directory into a temporary
@ -226,7 +226,7 @@ class DeviceManagerADB(DeviceManager):
data = self._runCmd(["shell", "unzip", "-o", remoteZip,
"-d", remoteDir]).stdout.read()
self._checkCmd(["shell", "rm", remoteZip],
retryLimit=retryLimit)
retryLimit=retryLimit, timeout=timeout)
if re.search("unzip: exiting", data) or re.search("Operation not permitted", data):
raise Exception("unzip failed, or permissions error")
except: