=== modified file 'lava_dispatcher/config.py'
@@ -95,7 +95,7 @@
adb_command = schema.StringOption()
fastboot_command = schema.StringOption()
- nexus_working_directory = schema.StringOption(default=None)
+ shared_working_directory = schema.StringOption(default=None)
class OptionDescriptor(object):
def __init__(self, name):
=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/nexus.conf'
@@ -25,19 +25,19 @@
# Working directory for temporary files. By default, the usual place for LAVA
# images will be used.
#
-# This is useful when the lava dispatcher is controlling Nexus phones that are
+# This is useful when the lava dispatcher is controlling the device under test which is
# physically plugged to other machines by setting adb_command to something like
# "ssh <phone-host> adb" and fastboot_command to something like "ssh
# <phone-host> fastboot". adb and fastboot always operate on local files, so
# you need your local files to also be seen as local files on the host where
# adb/fastboot are executed.
#
-# In this case, you should set nexus_work_directory to a shared directory
+# In this case, you should set shared_working_directory to a shared directory
# between the machine running the dispatcher and the machine where the phone is
# plugged. This shared directory must have the same path in both machines.
# For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at
# <phone-host> (or the other way around).
-nexus_working_directory =
+shared_working_directory =
connection_command = %(adb_command)s shell
=== renamed file 'lava_dispatcher/device/nexus.py' => 'lava_dispatcher/device/fastboot.py'
@@ -94,10 +94,10 @@
self('boot %s' % image)
-class NexusTarget(Target):
+class FastbootTarget(Target):
def __init__(self, context, config):
- super(NexusTarget, self).__init__(context, config)
+ super(FastbootTarget, self).__init__(context, config)
if not config.hard_reset_command:
logging.warn(
@@ -192,13 +192,13 @@
@property
def working_dir(self):
- if (self.config.nexus_working_directory is None or
- self.config.nexus_working_directory.strip() == ''):
+ if (self.config.shared_working_directory is None or
+ self.config.shared_working_directory.strip() == ''):
return self.scratch_dir
if self._working_dir is None:
- self._working_dir = mkdtemp(self.config.nexus_working_directory)
+ self._working_dir = mkdtemp(self.config.shared_working_directory)
return self._working_dir
-target_class = NexusTarget
+target_class = FastbootTarget