power_Resume: migrate to Python3
This re-enables the power_Resume test since it's now verified to work
with Python 3.
BUG=b:203802087
TEST=test_that --board atlas --py_version=3 dut power_Resume
test_that --board atlas --py_version=3 dut power_Resume.iterations
test_that --board atlas --py_version=3 dut power_Resume.resume_constraint
Change-Id: Ie4ff3746d23a49f6ac7d89ec8ad675e777815478
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3402727
Reviewed-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org>
Commit-Queue: Derek Basehore <dbasehore@chromium.org>
Tested-by: Derek Basehore <dbasehore@chromium.org>
Auto-Submit: Derek Basehore <dbasehore@chromium.org>
diff --git a/client/site_tests/power_Resume/_control b/client/site_tests/power_Resume/control
similarity index 83%
rename from client/site_tests/power_Resume/_control
rename to client/site_tests/power_Resume/control
index ca1c45e..696e67c 100644
--- a/client/site_tests/power_Resume/_control
+++ b/client/site_tests/power_Resume/control
@@ -2,11 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# TEST IS DISABLED UNTIL MIGRATED TO PYTHON 3.
-# For instructions on how to: go/tauto-py3-migration
-# To re-enable migrate to Python 3.
-# If the test is not migrated by 1/14/22 it will be deleted.
-
AUTHOR = "Chrome OS Team"
NAME = "power_Resume"
PURPOSE = "Measure the amount of time it takes to resume from suspend."
@@ -16,6 +11,7 @@
TEST_CATEGORY = "Logging"
TEST_CLASS = "power"
TEST_TYPE = "client"
+PY_VERSION = 3
DOC = """
This test will search /var/log/messages for pertinent strings to determine if
diff --git a/client/site_tests/power_Resume/_control.iterations b/client/site_tests/power_Resume/control.iterations
similarity index 84%
rename from client/site_tests/power_Resume/_control.iterations
rename to client/site_tests/power_Resume/control.iterations
index 14363de..7031188 100644
--- a/client/site_tests/power_Resume/_control.iterations
+++ b/client/site_tests/power_Resume/control.iterations
@@ -2,11 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# TEST IS DISABLED UNTIL MIGRATED TO PYTHON 3.
-# For instructions on how to: go/tauto-py3-migration
-# To re-enable migrate to Python 3.
-# If the test is not migrated by 1/14/22 it will be deleted.
-
AUTHOR = "Chrome OS Team"
NAME = "power_Resume.iterations"
PURPOSE = "Measure the amount of time it takes to resume from suspend."
@@ -16,6 +11,7 @@
TEST_CATEGORY = "Logging"
TEST_CLASS = "power"
TEST_TYPE = "client"
+PY_VERSION = 3
DOC = """
This test will search /var/log/messages for pertinent strings to determine if
diff --git a/client/site_tests/power_Resume/_control.resume_constraint b/client/site_tests/power_Resume/control.resume_constraint
similarity index 84%
rename from client/site_tests/power_Resume/_control.resume_constraint
rename to client/site_tests/power_Resume/control.resume_constraint
index feece47..ab5bc65 100644
--- a/client/site_tests/power_Resume/_control.resume_constraint
+++ b/client/site_tests/power_Resume/control.resume_constraint
@@ -2,11 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# TEST IS DISABLED UNTIL MIGRATED TO PYTHON 3.
-# For instructions on how to: go/tauto-py3-migration
-# To re-enable migrate to Python 3.
-# If the test is not migrated by 1/14/22 it will be deleted.
-
AUTHOR = "Chrome OS Team"
NAME = "power_Resume.resume_constraint"
PURPOSE = "Measure the amount of time it takes to resume from suspend."
@@ -16,6 +11,7 @@
TEST_CATEGORY = "Logging"
TEST_CLASS = "power"
TEST_TYPE = "client"
+PY_VERSION = 3
DOC = """
This test will search /var/log/messages for pertinent strings to determine if
diff --git a/client/site_tests/power_Resume/power_Resume.py b/client/site_tests/power_Resume/power_Resume.py
index bbf1312..115ebee 100644
--- a/client/site_tests/power_Resume/power_Resume.py
+++ b/client/site_tests/power_Resume/power_Resume.py
@@ -1,3 +1,4 @@
+# Lint as: python2, python3
# Copyright (c) 2010 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.
