From 9470efe410c88ddc6b168057fe775621379a899a Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Thu, 18 Jun 2015 08:39:02 +0100 Subject: [PATCH] chromeos_test_image: only set default password if keyfile was not specified --- wlauto/devices/linux/chromeos_test_image/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlauto/devices/linux/chromeos_test_image/__init__.py b/wlauto/devices/linux/chromeos_test_image/__init__.py index d1143ec5..67c64d69 100644 --- a/wlauto/devices/linux/chromeos_test_image/__init__.py +++ b/wlauto/devices/linux/chromeos_test_image/__init__.py @@ -42,12 +42,15 @@ class ChromeOsDevice(LinuxDevice): Parameter('core_names', default=[], override=True), Parameter('core_clusters', default=[], override=True), Parameter('username', default='root', override=True), - Parameter('password', default='test0000', override=True), Parameter('password_prompt', default='Password:', override=True), Parameter('binaries_directory', default='/usr/local/bin', override=True), Parameter('working_directory', default='/home/root/wa-working', override=True), ] + def validate(self): + if self.password is None and not self.keyfile: + self.password = 'test0000' + def initialize(self, context, *args, **kwargs): if self.busybox == 'busybox': self.logger.debug('Busybox already installed on the device: replacing with wa version')