commit 85e5d81d30b667dcdf623c2a555fa27478785a60
author Yu-Ju Hong <yjhong@chromium.org> Thu Feb 20 15:52:11 2014 -0800
committer Matthew Yuan <matthewyuan@chromium.org> Mon Feb 24 18:35:24 2014 +0000
tree 2647d12426b7f2fff1bb417f7661732475af3b17
parent ff69c9d0aed659c98458f9c0870badae805d9bd2

devinstall_test: fix error caused by recent change in remote_access.py

CL:186844 changed the argument of RemoteDevice and broke this
test. This CL fixes that.

BUG=chromium:345479
TEST=None

Change-Id: I59459f204aa70b87d39707d51f3d528159301a4f
Reviewed-on: https://chromium-review.googlesource.com/187338
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Yu-Ju Hong <yjhong@chromium.org>
(cherry picked from commit 640d4d0a728b33af5a505b7cd4b53b99680e0c2b)
Reviewed-on: https://chromium-review.googlesource.com/187634
Tested-by: Matthew Yuan <matthewyuan@chromium.org>
Reviewed-by: Matthew Yuan <matthewyuan@chromium.org>

devmode-test/devinstall_test.py

diff --git a/devmode-test/devinstall_test.py b/devmode-test/devinstall_test.py
index 1485848..f1ef374 100755
--- a/devmode-test/devinstall_test.py
+++ b/devmode-test/devinstall_test.py
@@ -67,7 +67,10 @@
         self.devserver.Stop()
 
       self.devserver = None
-      self.device.Cleanup()
+      if self.device:
+        self.device.Cleanup()
+
+      self.device = None
       self.vm.Stop()
       self.vm = None
       osutils.RmDir(self.tmpdir, ignore_missing=True)
@@ -108,7 +111,7 @@
     self.vm.Start()
 
     self.device = remote_access.ChromiumOSDevice(
-        remote_access.LOCALHOST, port=self.vm.port, work_dir=self.tmpdir)
+        remote_access.LOCALHOST, port=self.vm.port, base_dir=self.tmpdir)
 
     if not self.binhost:
       logging.info('Starting the devserver.')