| Index: server/site_tests/autoupdate_Host/autoupdate_Host.py
|
| diff --git a/server/site_tests/autoupdate_Host/autoupdate_Host.py b/server/site_tests/autoupdate_Host/autoupdate_Host.py
|
| index ba92be17d6342fbf8990e91400eb29ca57e897ae..e2e34ffbcedb18e5a8072cb403c6c5f4b52b0822 100644
|
| --- a/server/site_tests/autoupdate_Host/autoupdate_Host.py
|
| +++ b/server/site_tests/autoupdate_Host/autoupdate_Host.py
|
| @@ -4,7 +4,8 @@
|
|
|
| import logging, os, socket, time, zipfile
|
|
|
| -from autotest_lib.client.common_lib import error, chromiumos_updater
|
| +from autotest_lib.client.common_lib import error
|
| +from autotest_lib.client.common_lib.cros import autoupdater
|
| from autotest_lib.server import autotest, test, autoupdate_utils
|
|
|
| IGNORE_PATTERNS = ('*.pyc', '^.git', '^.gitignore')
|
| @@ -20,8 +21,8 @@ class autoupdate_Host(test.test):
|
| logging.info('Using image at: %s' % image_path)
|
| logging.info('Base update url: %s' % base_update_url)
|
|
|
| - # Initiate chromiumos_updater and retrieve old release version.
|
| - updater = chromiumos_updater.ChromiumOSUpdater(host, base_update_url)
|
| + # Initiate autoupdater and retrieve old release version.
|
| + updater = autoupdater.ChromiumOSUpdater(host, base_update_url)
|
| old_release = updater.get_build_id()
|
|
|
| # Setup client machine by overriding lsb-release.
|
| @@ -46,10 +47,10 @@ class autoupdate_Host(test.test):
|
| logging.info('Client boot_id: %s' % boot_id)
|
|
|
| # Poll update process until it completes.
|
| - status = chromiumos_updater.UPDATER_IDLE
|
| - while status != chromiumos_updater.UPDATER_NEED_REBOOT:
|
| + status = autoupdater.UPDATER_IDLE
|
| + while status != autoupdater.UPDATER_NEED_REBOOT:
|
| status = updater.check_update_status()
|
| - if status == chromiumos_updater.UPDATER_IDLE:
|
| + if status == autoupdater.UPDATER_IDLE:
|
| raise error.TestFail('Could not initiate update process on client.')
|
| logging.info('Update status: %s' % status)
|
| time.sleep(POLL_INTERVAL)
|
|
|