Convert autoupdate_Basic to py3
Py3 migration. Note that we need to wait for M96 stable to be rolled out
before submitting, as it will fail on boards that are still being served
M94 on stable.
BUG=b:197149480
TEST=autoupdate_Basic locally
Change-Id: Ic15d05927c90913211b6907d710251f243d6f247
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3345758
Reviewed-by: Derek Beckett <dbeckett@chromium.org>
Tested-by: Kyle Shimabukuro <kyleshima@chromium.org>
Reviewed-by: David Haddock <dhaddock@chromium.org>
Commit-Queue: David Haddock <dhaddock@chromium.org>
diff --git a/server/site_tests/autoupdate_Basic/autoupdate_Basic.py b/server/site_tests/autoupdate_Basic/autoupdate_Basic.py
index c1793d9..033041e 100644
--- a/server/site_tests/autoupdate_Basic/autoupdate_Basic.py
+++ b/server/site_tests/autoupdate_Basic/autoupdate_Basic.py
@@ -1,3 +1,4 @@
+# Lint as: python2, python3
# Copyright 2020 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.
diff --git a/server/site_tests/autoupdate_Basic/_control.delta b/server/site_tests/autoupdate_Basic/control.delta
similarity index 87%
rename from server/site_tests/autoupdate_Basic/_control.delta
rename to server/site_tests/autoupdate_Basic/control.delta
index 44574f3..ac6f186 100644
--- a/server/site_tests/autoupdate_Basic/_control.delta
+++ b/server/site_tests/autoupdate_Basic/control.delta
@@ -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 = "dhaddock, Chromium OS"
NAME = "autoupdate_Basic.delta"
TIME = "MEDIUM"
@@ -15,6 +10,7 @@
TEST_CLASS = "platform"
TEST_TYPE = "server"
ATTRIBUTES = "suite:au-perbuild"
+PY_VERSION = 3
DOC = """
This tests an N-to-N update. That means it will update to the same version
that the DUT was provisioned with. This test will be used in the CQ to ensure
diff --git a/server/site_tests/autoupdate_Basic/_control.full b/server/site_tests/autoupdate_Basic/control.full
similarity index 88%
rename from server/site_tests/autoupdate_Basic/_control.full
rename to server/site_tests/autoupdate_Basic/control.full
index 546bb39..8127e4b 100644
--- a/server/site_tests/autoupdate_Basic/_control.full
+++ b/server/site_tests/autoupdate_Basic/control.full
@@ -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 = "dhaddock, Chromium OS"
NAME = "autoupdate_Basic.full"
TIME = "MEDIUM"
@@ -16,6 +11,7 @@
TEST_TYPE = "server"
ATTRIBUTES = "suite:bvt-inline, suite:infra_qual, suite:satlab-qual-bvt-inline"
JOB_RETRIES = 2
+PY_VERSION = 3
DOC = """
This tests an N-to-N update. That means it will update to the same version
that the DUT was provisioned with. This test will be used in the CQ to ensure
diff --git a/server/site_tests/autoupdate_Basic/_control.full.pin b/server/site_tests/autoupdate_Basic/control.full.pin
similarity index 88%
rename from server/site_tests/autoupdate_Basic/_control.full.pin
rename to server/site_tests/autoupdate_Basic/control.full.pin
index 52f7541..8924b12 100644
--- a/server/site_tests/autoupdate_Basic/_control.full.pin
+++ b/server/site_tests/autoupdate_Basic/control.full.pin
@@ -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 = "dhaddock, Chromium OS"
NAME = "autoupdate_Basic.full.pin"
TIME = "MEDIUM"
@@ -15,6 +10,7 @@
TEST_CLASS = "platform"
TEST_TYPE = "server"
ATTRIBUTES = "suite:au-perbuild"
+PY_VERSION = 3
DOC = """
This tests an N-to-N update. That means it will update to the same version
that the DUT was provisioned with. This test will be used in the CQ to ensure
diff --git a/server/site_tests/autoupdate_Basic/_control.m2n.full b/server/site_tests/autoupdate_Basic/control.m2n.full
similarity index 87%
rename from server/site_tests/autoupdate_Basic/_control.m2n.full
rename to server/site_tests/autoupdate_Basic/control.m2n.full
index ce0e367..6a85c59 100644
--- a/server/site_tests/autoupdate_Basic/_control.m2n.full
+++ b/server/site_tests/autoupdate_Basic/control.m2n.full
@@ -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 = "dhaddock, Chromium OS"
NAME = "autoupdate_Basic.m2n.full"
TIME = "MEDIUM"
@@ -16,6 +11,7 @@
TEST_TYPE = "server"
ATTRIBUTES = "suite:bvt-inline"
JOB_RETRIES = 2
+PY_VERSION = 3
DOC = """
This tests an M-to-N update. That means it will update from the current stable
version for this board to ToT. This test will be used in the CQ to ensure
diff --git a/server/site_tests/autoupdate_Basic/_control.m2n.full.pin b/server/site_tests/autoupdate_Basic/control.m2n.full.pin
similarity index 88%
rename from server/site_tests/autoupdate_Basic/_control.m2n.full.pin
rename to server/site_tests/autoupdate_Basic/control.m2n.full.pin
index 1c10567..52405bb 100644
--- a/server/site_tests/autoupdate_Basic/_control.m2n.full.pin
+++ b/server/site_tests/autoupdate_Basic/control.m2n.full.pin
@@ -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 = "dhaddock, Chromium OS"
NAME = "autoupdate_Basic.m2n.full.pin"
TIME = "MEDIUM"
@@ -15,6 +10,7 @@
TEST_CLASS = "platform"
TEST_TYPE = "server"
ATTRIBUTES = "suite:au-perbuild"
+PY_VERSION = 3
DOC = """
This tests an M-to-N update. That means it will update from the current stable
version for this board to ToT. This test will be used in the CQ to ensure
