зеркало из https://github.com/mozilla/gecko-dev.git
Bug 672538 - remotereftest.py and runtestsremote.py reference dm_auto before initialized; r=jmaher
This commit is contained in:
Родитель
b9120f9a8e
Коммит
f6de8f0e85
|
@ -96,6 +96,8 @@ class DeviceManagerADB(DeviceManager):
|
|||
# contains symbolic links, the links are pushed, rather than the linked
|
||||
# files; we push file-by-file to get around this limitation
|
||||
try:
|
||||
if (not self.dirExists(remoteDir)):
|
||||
self.mkDirs(remoteDir+"/x")
|
||||
for root, dirs, files in os.walk(localDir):
|
||||
relRoot = os.path.relpath(root, localDir)
|
||||
for file in files:
|
||||
|
|
|
@ -393,7 +393,7 @@ def main():
|
|||
if (options.deviceIP):
|
||||
dm = devicemanagerADB.DeviceManagerADB(options.deviceIP, options.devicePort)
|
||||
else:
|
||||
dm = dm_auto
|
||||
dm = dm_none
|
||||
else:
|
||||
dm = devicemanagerSUT.DeviceManagerSUT(options.deviceIP, options.devicePort)
|
||||
automation.setDeviceManager(dm)
|
||||
|
|
|
@ -315,7 +315,7 @@ def main():
|
|||
if (options.deviceIP):
|
||||
dm = devicemanagerADB.DeviceManagerADB(options.deviceIP, options.devicePort)
|
||||
else:
|
||||
dm = dm_auto
|
||||
dm = dm_none
|
||||
else:
|
||||
dm = devicemanagerSUT.DeviceManagerSUT(options.deviceIP, options.devicePort)
|
||||
auto.setDeviceManager(dm)
|
||||
|
|
Загрузка…
Ссылка в новой задаче