commit cc27c0468189458663f2ae0f09cd7687646b294a
author markdr <markdr@google.com> Tue May 02 13:58:48 2017 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Jun 02 12:25:45 2017 -0700
tree 4ebb28c5e19e788c94fb153c923b6c2e9d313ced
parent 0b4e6ec29956222f7914bba76d085f5f3ad964a2

Skip setup wizard fixes

BUG=b:37205581
TEST=Ran SampleTestBed in Autotest
Change-Id: I7a62d87668a11c3647f0efa4fd5a0a683d59e1d5
Reviewed-on: https://chromium-review.googlesource.com/508059
Commit-Ready: Mark De Ruyter <markdr@google.com>
Tested-by: Mark De Ruyter <markdr@google.com>
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Benjamin Peake <bpeake@chromium.org>
Reviewed-by: Kris Rambish <krisr@chromium.org>

server/hosts/adb_host.py

diff --git a/server/hosts/adb_host.py b/server/hosts/adb_host.py
index b01156e..d70bd5d 100644
--- a/server/hosts/adb_host.py
+++ b/server/hosts/adb_host.py
@@ -1741,8 +1741,30 @@
         """
         logging.info('Skipping setup wizard on %s.', self.adb_serial)
         self.check_boot_to_adb_complete()
-        self.run('am start -n com.google.android.setupwizard/'
-                 '.SetupWizardExitActivity')
+        result = self.run('am start -n com.google.android.setupwizard/'
+                          '.SetupWizardExitActivity')
+
+        if result.exit_status != 0:
+            if result.stdout.startswith('ADB_CMD_OUTPUT:255'):
+                # If the result returns ADB_CMD_OUTPUT:255, then run the above
+                # as root.
+                logging.debug('Need root access to bypass setup wizard.')
+                self._restart_adbd_with_root_permissions()
+                result = self.run('am start -n com.google.android.setupwizard/'
+                                  '.SetupWizardExitActivity')
+
+            if result.stdout == 'ADB_CMD_OUTPUT:0':
+                # If the result returns ADB_CMD_OUTPUT:0, Error type 3, then the
+                # setup wizard does not exist, so we do not have to bypass it.
+                if result.stderr and not \
+                        result.stderr.startswith('Error type 3\n'):
+                    logging.error('Unrecoverable skip setup wizard failure:'
+                                  ' %s', result.stderr)
+                    raise error.TestError()
+                logging.debug('Skip setup wizard received harmless error: '
+                              'No setup to bypass.')
+
+        logging.debug('Bypass setup wizard was successful.')
 
 
     def get_attributes_to_clear_before_provision(self):