autoupdate_StartOOBEUpdate: fix missing full_payload argument
Previous CL crrev.com/c/2106521 missed adding this argument in a few
places. This CL fixes it.
BUG=chromium:1063053
TEST=None
Change-Id: Id899277005b68d58778148986b0c6f31526d70b9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2109976
Tested-by: Amin Hassani <ahassani@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Kyle Shimabukuro <kyleshima@chromium.org>
diff --git a/client/cros/update_engine/update_engine_util.py b/client/cros/update_engine/update_engine_util.py
index 2f91d92..3ae861c 100644
--- a/client/cros/update_engine/update_engine_util.py
+++ b/client/cros/update_engine/update_engine_util.py
@@ -296,7 +296,8 @@
Appends the dictionary kwargs to the URL url as query string.
This function will replace the already existing query strings in url
- with the ones in the input dictionary.
+ with the ones in the input dictionary. I also removes keys that have
+ a None value.
@param url: The given input URL.
@param query_dicl: A dictionary of key/values to be converted to query
@@ -311,7 +312,8 @@
for k, v in query_dict.items():
parsed_query[k] = [v]
parsed_url[3] = '&'.join(
- '%s=%s' % (k, v[0]) for k, v in parsed_query.items())
+ '%s=%s' % (k, v[0]) for k, v in parsed_query.items()
+ if v[0] is not None)
return urlparse.urlunsplit(parsed_url)
diff --git a/client/site_tests/autoupdate_StartOOBEUpdate/autoupdate_StartOOBEUpdate.py b/client/site_tests/autoupdate_StartOOBEUpdate/autoupdate_StartOOBEUpdate.py
index b4d1d4d..e376399 100644
--- a/client/site_tests/autoupdate_StartOOBEUpdate/autoupdate_StartOOBEUpdate.py
+++ b/client/site_tests/autoupdate_StartOOBEUpdate/autoupdate_StartOOBEUpdate.py
@@ -72,7 +72,8 @@
raise e
- def run_once(self, image_url, cellular=False, critical_update=True):
+ def run_once(self, image_url, cellular=False, critical_update=True,
+ full_payload=None):
"""
Test that will start a forced update at OOBE.
@@ -81,11 +82,13 @@
@param cellular: True if we should run this test using a sim card.
@param critical_update: True if we should have deadline:now in omaha
response.
+ @param full_payload: Whether the payload is full or delta. None if we
+ don't have to care about it.
"""
if critical_update:
- self._start_oobe_update(image_url, critical_update)
+ self._start_oobe_update(image_url, critical_update, full_payload)
return
metadata_dir = autotemp.tempdir()
@@ -102,7 +105,7 @@
update_url = nebraska.get_update_url(
critical_update=critical_update)
if not cellular:
- self._start_oobe_update(update_url, critical_update)
+ self._start_oobe_update(update_url, critical_update, None)
return
try:
@@ -114,7 +117,7 @@
test_env.shill.connect_service_synchronous(service,
connect_timeout)
- self._start_oobe_update(update_url, critical_update)
+ self._start_oobe_update(update_url, critical_update, None)
# Remove the custom omaha server from lsb release because
# after we reboot it will no longer be running.
diff --git a/server/site_tests/autoupdate_NonBlockingOOBEUpdate/autoupdate_NonBlockingOOBEUpdate.py b/server/site_tests/autoupdate_NonBlockingOOBEUpdate/autoupdate_NonBlockingOOBEUpdate.py
index ac4396a..94b08b0 100644
--- a/server/site_tests/autoupdate_NonBlockingOOBEUpdate/autoupdate_NonBlockingOOBEUpdate.py
+++ b/server/site_tests/autoupdate_NonBlockingOOBEUpdate/autoupdate_NonBlockingOOBEUpdate.py
@@ -48,6 +48,7 @@
self._run_client_test_and_check_result('autoupdate_StartOOBEUpdate',
image_url=image_url,
+ full_payload=full_payload,
critical_update=False)
# Check that the update failed as expected.
