Remove policy_AUServer.TargetVersion tests
The team decided we don't need these tests since these cases are
sufficiently covered by unit tests and the autotests aren't adding much
value.
BUG=chromium:1138491
TEST=None
Change-Id: Ife38665fc417fca956e792c5dea614f02636ab69
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2489023
Tested-by: Kyle Shimabukuro <kyleshima@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Reviewed-by: David Haddock <dhaddock@chromium.org>
Commit-Queue: Kyle Shimabukuro <kyleshima@chromium.org>
diff --git a/client/site_tests/policy_DeviceTargetVersionPrefix/policy_DeviceTargetVersionPrefix.py b/client/site_tests/policy_DeviceTargetVersionPrefix/policy_DeviceTargetVersionPrefix.py
deleted file mode 100644
index 75e6ddd..0000000
--- a/client/site_tests/policy_DeviceTargetVersionPrefix/policy_DeviceTargetVersionPrefix.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 2018 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.
-
-import logging
-import re
-
-from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib import utils
-from autotest_lib.client.cros.enterprise import enterprise_policy_base
-from autotest_lib.client.cros.update_engine import nebraska_wrapper
-from autotest_lib.client.cros.update_engine import update_engine_test
-
-
-class policy_DeviceTargetVersionPrefix(
- enterprise_policy_base.EnterprisePolicyTest,
- update_engine_test.UpdateEngineTest):
- """
- Test for the DeviceTargetVersionPrefix policy.
-
- Cases:
- short_prefix - prefix value is a shortened string of the serving build.
- full_prefix - prefix value is a full string of the serving build.
- not_set - policy not set.
-
- This test only checks whether the update request has the correct values,
- since the client does not check if the version listed in the update
- returned by the AU devserver matches or not.
-
- """
- version = 1
- _POLICY_NAME = 'DeviceTargetVersionPrefix'
- _TEST_CASES = {'short_prefix': '4444.',
- 'full_prefix': '4444.4.4',
- 'notset': None}
-
- # The policy value -> what the device will send in the update request.
- _POLICY_TO_REQUEST = {'4444.': '4444', '4444.4.4': '4444.4.'}
-
-
- def _test_version_prefix(self, prefix_value, update_url):
- """
- Actual test. Fail if update request doesn't match expected.
-
- @param prefix_value: the value of this policy.
- @param update_url: The URL to get update from.
-
- @raises error.TestFail if test does not pass.
-
- """
- # E.g. <updatecheck targetversionprefix="10718.25.0.">
- MATCH_STR = r'targetversionprefix="(.*?).?"'
-
- self._check_for_update(update_url)
-
- utils.poll_for_condition(
- self._is_update_started,
- timeout=60,
- exception=error.TestFail('Update did not start!'))
-
- latest_request = self._get_latest_initial_request()
- if not latest_request:
- raise error.TestFail('Could not find most recent update request!')
-
- search = re.search(MATCH_STR, latest_request)
- # If policy is not set, there should be no matches.
- if not prefix_value:
- if search:
- raise error.TestFail('Version prefix was set when the policy '
- 'was not set!')
- # If policy is set, the value should be in the update request.
- else:
- if not search:
- raise error.TestFail('Update request did not contain target '
- 'version prefix!')
- logging.info('Match value: %s', search.group(1))
- if search.group(1) != self._POLICY_TO_REQUEST[prefix_value]:
- raise error.TestFail('Version prefix in this update did not '
- 'match the value expected from policy!')
-
-
- def run_once(self, case, image_url):
- """
- Entry point of this test.
-
- @param case: Name of the testcase to run.
- @param image_url: Url of update image (this build).
-
- """
- # Because we are doing polimorphism and the EnterprisePolicyTest is
- # earlier in the python MRO, this class's initialize() will get called,
- # but not the UpdateEngineTest's initialize(). So we need to call it
- # manually.
- update_engine_test.UpdateEngineTest.initialize(self)
-
- case_value = self._TEST_CASES[case]
- self.setup_case(device_policies={self._POLICY_NAME: case_value},
- enroll=True)
-
- with nebraska_wrapper.NebraskaWrapper(
- log_dir=self.resultsdir, payload_url=image_url,
- target_version='999999.9.9') as nebraska:
-
- update_url = nebraska.get_update_url()
- self._create_custom_lsb_release(update_url, build='1.1.1')
-
- self._test_version_prefix(case_value, nebraska.get_update_url())
diff --git a/server/site_tests/policy_AUServer/control.TargetVersion.full_prefix b/server/site_tests/policy_AUServer/control.TargetVersion.full_prefix
deleted file mode 100644
index 9bf71cf..0000000
--- a/server/site_tests/policy_AUServer/control.TargetVersion.full_prefix
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018 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.server import utils
-
-AUTHOR = 'kathrelkeld'
-NAME = 'policy_AUServer.TargetVersion.full_prefix'
-TIME = 'SHORT'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'enterprise'
-TEST_TYPE = 'server'
-ATTRIBUTES = 'suite:ent-nightly, suite:policy'
-
-DOC = """
-Sets up and runs the client test for the DeviceTargetVersionPrefix
-policy.
-
-"""
-args_dict = utils.args_to_dict(args)
-client_test = 'policy_DeviceTargetVersionPrefix'
-case = 'full_prefix'
-
-def run(machine):
- host = hosts.create_host(machine)
- job.run_test('policy_AUServer', host=host, client_test=client_test,
- case=case, **args_dict)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/policy_AUServer/control.TargetVersion.notset b/server/site_tests/policy_AUServer/control.TargetVersion.notset
deleted file mode 100644
index ad4b208..0000000
--- a/server/site_tests/policy_AUServer/control.TargetVersion.notset
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018 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.server import utils
-
-AUTHOR = 'kathrelkeld'
-NAME = 'policy_AUServer.TargetVersion.notset'
-TIME = 'SHORT'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'enterprise'
-TEST_TYPE = 'server'
-ATTRIBUTES = 'suite:ent-nightly, suite:policy'
-
-DOC = """
-Sets up and runs the client test for the DeviceTargetVersionPrefix
-policy.
-
-"""
-args_dict = utils.args_to_dict(args)
-client_test = 'policy_DeviceTargetVersionPrefix'
-case = 'notset'
-
-def run(machine):
- host = hosts.create_host(machine)
- job.run_test('policy_AUServer', host=host, client_test=client_test,
- case=case, **args_dict)
-
-parallel_simple(run, machines)
diff --git a/server/site_tests/policy_AUServer/control.TargetVersion.short_prefix b/server/site_tests/policy_AUServer/control.TargetVersion.short_prefix
deleted file mode 100644
index 1d1f21b..0000000
--- a/server/site_tests/policy_AUServer/control.TargetVersion.short_prefix
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018 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.server import utils
-
-AUTHOR = 'kathrelkeld'
-NAME = 'policy_AUServer.TargetVersion.short_prefix'
-TIME = 'SHORT'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'enterprise'
-TEST_TYPE = 'server'
-ATTRIBUTES = 'suite:ent-nightly, suite:policy'
-
-DOC = """
-Sets up and runs the client test for the DeviceTargetVersionPrefix
-policy.
-
-"""
-args_dict = utils.args_to_dict(args)
-client_test = 'policy_DeviceTargetVersionPrefix'
-case = 'short_prefix'
-
-def run(machine):
- host = hosts.create_host(machine)
- job.run_test('policy_AUServer', host=host, client_test=client_test,
- case=case, **args_dict)
-
-parallel_simple(run, machines)
