hardware_StorageQual: Enable SSP for suspend and trim stress
hardware_StorageQualSuspendStress and hardware_StorageQualTrimStress
are run during the storage qual test suites, but involve creating a
control file within the test file. We want to enable SSP to make sure
that the test code will be run from the build being tested rather than
the code deployed to the moblab. In order for that to work we need the
SSP requirement to be pushed through the control file we create during
these tests.
BUG=b:172342187
TEST=Previously tested manually on a moblab,
tested running qual locally with test_that had no side effect
Change-Id: I5dfc80dc01b3f01239f0edb13a9a93333b4d6f50
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2593834
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Tested-by: Alexis Savery <asavery@chromium.org>
Commit-Queue: Alexis Savery <asavery@chromium.org>
diff --git a/server/site_tests/hardware_StorageQualSuspendStress/hardware_StorageQualSuspendStress.py b/server/site_tests/hardware_StorageQualSuspendStress/hardware_StorageQualSuspendStress.py
index df7a9a8..583176f 100644
--- a/server/site_tests/hardware_StorageQualSuspendStress/hardware_StorageQualSuspendStress.py
+++ b/server/site_tests/hardware_StorageQualSuspendStress/hardware_StorageQualSuspendStress.py
@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from autotest_lib.client.bin import utils
-from autotest_lib.client.common_lib import error
from autotest_lib.server import autotest
from autotest_lib.server import hosts
from autotest_lib.server import test
@@ -21,7 +19,7 @@
fio_test = "hardware_StorageFio"
if other_dev:
fio_test = "hardware_StorageFioOther"
- control = """job.parallel(
+ control = """REQUIRE_SSP = True \n\njob.parallel(
[lambda: job.run_test('power_SuspendStress', tag='disk',
duration=%d, init_delay=10, min_suspend=7, min_resume=30,
check_connection=True)],
@@ -34,4 +32,3 @@
blkdiscard=False,
requirements=[('write_stress', ['v'])],
tag='qual_verify')
-
diff --git a/server/site_tests/hardware_StorageQualTrimStress/hardware_StorageQualTrimStress.py b/server/site_tests/hardware_StorageQualTrimStress/hardware_StorageQualTrimStress.py
index 3b76450..ddbaeeb 100644
--- a/server/site_tests/hardware_StorageQualTrimStress/hardware_StorageQualTrimStress.py
+++ b/server/site_tests/hardware_StorageQualTrimStress/hardware_StorageQualTrimStress.py
@@ -22,7 +22,7 @@
client = hosts.create_host(client_ip)
client_at = autotest.Autotest(client)
- control = """job.parallel(
+ control = """REQUIRE_SSP = True \n\njob.parallel(
[lambda: job.run_test('power_SuspendStress', tag='disk',
duration=%d, init_delay=10, min_suspend=7, min_resume=30,
check_connection=True)],
@@ -30,4 +30,3 @@
disable_sysinfo=True,
tag='qual_trim')])""" % (duration, duration)
client_at.run(control, '.', None)
-
