зеркало из https://github.com/mozilla/gecko-dev.git
Bug 598366 - remote logging with mochitest needs a little love for android and large files. r=ctalbert, a=sayrer
This commit is contained in:
Родитель
2e222d6a5d
Коммит
bcef7bab4e
|
@ -166,6 +166,7 @@ class DeviceManager:
|
||||||
# TODO: We had an old sleep here but we don't need it
|
# TODO: We had an old sleep here but we don't need it
|
||||||
|
|
||||||
while (found == False and (loopguard < recvGuard)):
|
while (found == False and (loopguard < recvGuard)):
|
||||||
|
temp = ''
|
||||||
if (self.debug >= 4): print "recv'ing..."
|
if (self.debug >= 4): print "recv'ing..."
|
||||||
|
|
||||||
# Get our response
|
# Get our response
|
||||||
|
@ -193,7 +194,8 @@ class DeviceManager:
|
||||||
|
|
||||||
# If we violently lose the connection to the device, this loop tends to spin,
|
# If we violently lose the connection to the device, this loop tends to spin,
|
||||||
# this guard prevents that
|
# this guard prevents that
|
||||||
loopguard = loopguard + 1
|
if (temp == ''):
|
||||||
|
loopguard += 1
|
||||||
|
|
||||||
# TODO: We had an old sleep here but we don't need it
|
# TODO: We had an old sleep here but we don't need it
|
||||||
if (shouldCloseSocket == True):
|
if (shouldCloseSocket == True):
|
||||||
|
|
|
@ -125,7 +125,10 @@ class RemoteOptions(MochitestOptions):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
if (options.remoteLogFile == None):
|
if (options.remoteLogFile == None):
|
||||||
options.remoteLogFile = automation._devicemanager.getDeviceRoot() + '/test.log'
|
options.remoteLogFile = automation._devicemanager.getDeviceRoot() + '/test.log'
|
||||||
|
|
||||||
|
if (options.remoteLogFile.count('/') < 1):
|
||||||
|
options.remoteLogFile = automation._devicemanager.getDeviceRoot() + '/' + options.remoteLogFile
|
||||||
|
|
||||||
# Set up our options that we depend on based on the above
|
# Set up our options that we depend on based on the above
|
||||||
productRoot = options.remoteTestRoot + "/" + automation._product
|
productRoot = options.remoteTestRoot + "/" + automation._product
|
||||||
|
@ -286,6 +289,7 @@ def main():
|
||||||
if (options == None):
|
if (options == None):
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
auto.setRemoteLog(options.remoteLogFile)
|
||||||
auto.setServerInfo(options.webServer, options.httpPort, options.sslPort)
|
auto.setServerInfo(options.webServer, options.httpPort, options.sslPort)
|
||||||
sys.exit(mochitest.runTests(options))
|
sys.exit(mochitest.runTests(options))
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче