[autotest] Fixing two tests that were broken due to infra code changes.
policy_DeviceWilcoDtcAllowed
policy_WilcoOnNonWilcoDevice
BUG=None
TEST=None
Change-Id: I72cd4ee08b7d14e018210bb3cd7ffa5590faafce
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1946725
Tested-by: Ruben Zakarian <rzakarian@chromium.org>
Reviewed-by: Derek Beckett <dbeckett@chromium.org>
Commit-Queue: Ruben Zakarian <rzakarian@chromium.org>
diff --git a/client/site_tests/policy_DeviceWilcoDtcAllowed/policy_DeviceWilcoDtcAllowed.py b/client/site_tests/policy_DeviceWilcoDtcAllowed/policy_DeviceWilcoDtcAllowed.py
index c5676ee..bb3493b 100644
--- a/client/site_tests/policy_DeviceWilcoDtcAllowed/policy_DeviceWilcoDtcAllowed.py
+++ b/client/site_tests/policy_DeviceWilcoDtcAllowed/policy_DeviceWilcoDtcAllowed.py
@@ -30,17 +30,8 @@
extra_chrome_flags=['--user-always-affiliated'])
def _update_policy_value(self, value):
- self.fake_dm_server.setup_policy(self._make_json_blob(
- device_policies={'DeviceWilcoDtcAllowed': value}))
- policy_tab = self.navigate_to_url(self.CHROME_POLICY_PAGE)
- reload_button = "document.querySelector('button#reload-policies')"
- policy_tab.ExecuteJavaScript("%s.click()" % reload_button)
- utils.poll_for_condition(
- lambda: self._get_policy_value_from_new_tab(
- 'DeviceWilcoDtcAllowed') == value,
- exception=error.TestFail('Policy value not updated.'),
- timeout=10,
- sleep_interval=1)
+ self.update_policies(device_policies={'DeviceWilcoDtcAllowed': value})
+ self.verify_policy_value('DeviceWilcoDtcAllowed', value)
def _check_status(self, expected_status):
result = utils.run('status wilco_dtc')
diff --git a/client/site_tests/policy_WilcoOnNonWilcoDevice/policy_WilcoOnNonWilcoDevice.py b/client/site_tests/policy_WilcoOnNonWilcoDevice/policy_WilcoOnNonWilcoDevice.py
index 62f889f..d5679ea 100644
--- a/client/site_tests/policy_WilcoOnNonWilcoDevice/policy_WilcoOnNonWilcoDevice.py
+++ b/client/site_tests/policy_WilcoOnNonWilcoDevice/policy_WilcoOnNonWilcoDevice.py
@@ -1,15 +1,8 @@
# Copyright 2019 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib import utils
-
-from autotest_lib.client.common_lib.cros import retry
-
from autotest_lib.client.cros.enterprise import enterprise_policy_base
-from py_utils import TimeoutException
-
class policy_WilcoOnNonWilcoDevice(
enterprise_policy_base.EnterprisePolicyTest):
@@ -21,7 +14,6 @@
"""
version = 1
- @retry.retry(TimeoutException, timeout_min=5, delay_sec=10)
def _run_setup_case(self, tests):
self.setup_case(
device_policies={
@@ -29,11 +21,6 @@
enroll=True,
extra_chrome_flags=['--user-always-affiliated'])
- def _update_policy_page(self):
- policy_tab = self.navigate_to_url(self.CHROME_POLICY_PAGE)
- reload_button = "document.querySelector('button#reload-policies')"
- policy_tab.ExecuteJavaScript("%s.click()" % reload_button)
-
def run_once(self, tests):
"""
Entry point of this test.
@@ -44,12 +31,6 @@
self._run_setup_case(tests)
tests.pop(0)
for test in tests:
- self.fake_dm_server.setup_policy(self._make_json_blob(
- device_policies={test['Policy_Name']: test['Policy_Value']}))
- self._update_policy_page()
- utils.poll_for_condition(
- lambda: self._get_policy_value_from_new_tab(
- test['Policy_Name']) == test['Policy_Value'],
- exception=error.TestFail('Policy value not updated.'),
- timeout=10,
- sleep_interval=1)
+ self.update_policies(
+ device_policies={test['Policy_Name']: test['Policy_Value']})
+ self.verify_policy_value(test['Policy_Name'], test['Policy_Value'])