power: Deprecate explicit SuspendTo versions of resume tests.
These tests were created to largely track deltas between
suspend-to-ram(s3) vs suspend-to-idle(s0ix) when first rolling it out
on intel platforms.
As we've now committed to s0ix given its has parity w/ respect to
power & reliability to s3 and it resumes much faster than s3 its time
to deprecate these tests.
Should above conditions not be met or need to be revisited for another
SOC vendor we can revive them but for now its just wasting disk space
and computes to produce test results of a config no one ever uses.
BUG=b:160353027
TEST=none
Change-Id: Ie5392daaf27a7d012deed8bcca746009772732a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2278115
Tested-by: Todd Broch <tbroch@chromium.org>
Auto-Submit: Todd Broch <tbroch@chromium.org>
Reviewed-by: Puthikorn Voravootivat <puthik@chromium.org>
Commit-Queue: Todd Broch <tbroch@chromium.org>
diff --git a/client/site_tests/power_Resume/control.SuspendToIdle b/client/site_tests/power_Resume/control.SuspendToIdle
deleted file mode 100644
index d4546ce..0000000
--- a/client/site_tests/power_Resume/control.SuspendToIdle
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_Resume.SuspendToIdle"
-PURPOSE = "Measure the time it takes to resume from suspend-to-idle."
-CRITERIA = "This test is a benchmark."
-ATTRIBUTES = "suite:power_build"
-TIME = "SHORT"
-TEST_CATEGORY = "Logging"
-TEST_CLASS = "power"
-TEST_TYPE = "client"
-
-DOC = """
-This test will search /var/log/messages for pertinent strings to determine if
-the cpu is sleeping. It will wait for a number of seconds before suspending to
-idle. It will then calculate how many seconds the system was suspended, and
-how many seconds it took to resume. As a precaution it will ensure your
-network interface is UP after it has resumed.
-"""
-
-job.add_sysinfo_command('cbmem -c', logfile='bios_log', on_every_test=True)
-job.add_sysinfo_command('cbmem -t', logfile='bios_times', on_every_test=True)
-job.run_test('power_Resume', ignore_kernel_warns=True, suspend_state='freeze',
- tag=NAME.split('.')[1])
diff --git a/client/site_tests/power_Resume/control.SuspendToRam b/client/site_tests/power_Resume/control.SuspendToRam
deleted file mode 100644
index 721dbee..0000000
--- a/client/site_tests/power_Resume/control.SuspendToRam
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_Resume.SuspendToRam"
-PURPOSE = "Measure the time it takes to resume from suspend-to-ram."
-CRITERIA = "This test is a benchmark."
-ATTRIBUTES = "suite:power_build"
-TIME = "SHORT"
-TEST_CATEGORY = "Logging"
-TEST_CLASS = "power"
-TEST_TYPE = "client"
-
-DOC = """
-This test will search /var/log/messages for pertinent strings to determine if
-the cpu is sleeping. It will wait for a number of seconds before suspending to
-ram. It will then calculate how many seconds the system was suspended, and
-how many seconds it took to resume. As a precaution it will ensure your
-network interface is UP after it has resumed.
-"""
-
-job.add_sysinfo_command('cbmem -c', logfile='bios_log', on_every_test=True)
-job.add_sysinfo_command('cbmem -t', logfile='bios_times', on_every_test=True)
-job.run_test('power_Resume', ignore_kernel_warns=True, suspend_state='mem',
- tag=NAME.split('.')[1])
diff --git a/client/site_tests/power_UiResume/control.SuspendToIdle b/client/site_tests/power_UiResume/control.SuspendToIdle
deleted file mode 100644
index 9ee5699..0000000
--- a/client/site_tests/power_UiResume/control.SuspendToIdle
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_UiResume.SuspendToIdle"
-PURPOSE = "Measure the time it takes to resume from suspend-to-idle."
-CRITERIA = "This test is a benchmark."
-ATTRIBUTES = "suite:power_build"
-TIME = "SHORT"
-TEST_CATEGORY = "Logging"
-TEST_CLASS = "power"
-TEST_TYPE = "client"
-
-DOC = """
-This test will search /var/log/messages for pertinent strings to determine if
-the cpu is sleeping. It will wait for a number of seconds before suspending to
-idle. It will then calculate how many seconds the system was suspended, and
-how many seconds it took to resume. It will also parse the ARC logcat to measure
-how many seconds it took for ARC to suspend and then resume. As a precaution it
-will ensure your network interface is UP after it has resumed.
-"""
-
-job.run_test('power_UiResume', ignore_kernel_warns=True, suspend_state='freeze')
diff --git a/client/site_tests/power_UiResume/control.SuspendToRam b/client/site_tests/power_UiResume/control.SuspendToRam
deleted file mode 100644
index 1e7fe76..0000000
--- a/client/site_tests/power_UiResume/control.SuspendToRam
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_UiResume.SuspendToRam"
-PURPOSE = "Measure the time it takes to resume from suspend-to-ram."
-CRITERIA = "This test is a benchmark."
-ATTRIBUTES = "suite:power_build"
-TIME = "SHORT"
-TEST_CATEGORY = "Logging"
-TEST_CLASS = "power"
-TEST_TYPE = "client"
-
-DOC = """
-This test will search /var/log/messages for pertinent strings to determine if
-the cpu is sleeping. It will wait for a number of seconds before suspending to
-ram. It will then calculate how many seconds the system was suspended, and
-how many seconds it took to resume. It will also parse the ARC logcat to measure
-how many seconds it took for ARC to suspend and then resume. As a precaution it
-will ensure your network interface is UP after it has resumed.
-"""
-
-job.run_test('power_UiResume', ignore_kernel_warns=True, suspend_state='mem')
