commit af30e7c634ccbcf14976e397ed372b1ddacee8d7
author Fang Deng <fdeng@chromium.org> Sat Nov 15 13:57:03 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Nov 21 06:23:40 2014 +0000
tree 7f5a28357ecff91b8798491ea7d78cc1bc5e7fe2
parent 6f1c8fab15eb2e783b73b522ff31f5a98e21d9e5

[autotest] Allow non-test provision actions like reboot

"cleanup-reboot" dependency triggers a provision action
test "generic_Reboot". Running reboot in a saperate test
is very slow as it involves setup autotest environment (e.g. fetch
autotest packages) at the beginning and clean up at the end.

Reboot can be achieved by just running host.reboot() and there is no
need to run it in a test. This cl allows us to run a non-test
provision action like reboot.

TEST=Test both test-based and non-test provision actions
cli/atest job create -f client/site_tests/dummy_Pass/control -d
cleanup-reboot -m HOST my-job
cli/atest job create -f client/site_tests/dummy_Pass/control -d
cros-versioin:lumpy-release/R41-6476.0.0 -m HOST my-job
run a dummy suite using run_suite.
BUG=chromium:433924

Change-Id: I3b449238b823fbede9d8583de9adcb5254bac23c
Reviewed-on: https://chromium-review.googlesource.com/229968
Reviewed-by: Dan Shi <dshi@chromium.org>
Commit-Queue: Fang Deng <fdeng@chromium.org>
Tested-by: Fang Deng <fdeng@chromium.org>

server/cros/provision.py

diff --git a/server/cros/provision.py b/server/cros/provision.py
index 5d9e783..36f1351 100644
--- a/server/cros/provision.py
+++ b/server/cros/provision.py
@@ -9,6 +9,7 @@
 import common
 from autotest_lib.frontend.afe.json_rpc import proxy
 from autotest_lib.server import frontend
+from autotest_lib.server.cros import provision_actionables as actionables
 
 
 ### Constants for label prefixes
@@ -119,7 +120,7 @@
     """
 
     _actions = {
-        'modem_repair': 'cellular_StaleModemReboot',
+        'modem_repair': actionables.TestActionable('cellular_StaleModemReboot'),
         # TODO(crbug.com/404421): set rpm action to power_RPMTest after the RPM
         # is stable in lab (destiny). The power_RPMTest failure led to reset job
         # failure and that left dut in Repair Failed. Since the test will fail
@@ -129,7 +130,7 @@
         # Another way to do this is to remove rpm dependency from tests' control
         # file. That will involve changes on multiple control files. This one
         # line change here is a simple temporary fix.
-        'rpm': 'dummy_PassServer',
+        'rpm': actionables.TestActionable('dummy_PassServer'),
     }
 
     name = 'verify'
@@ -145,8 +146,9 @@
     # Create some way to discover and register provisioning tests so that we
     # don't need to hand-maintain a list of all of them.
     _actions = {
-        CROS_VERSION_PREFIX: 'provision_AutoUpdate',
-        FW_VERSION_PREFIX: 'provision_FirmwareUpdate',
+        CROS_VERSION_PREFIX: actionables.TestActionable('provision_AutoUpdate'),
+        FW_VERSION_PREFIX: actionables.TestActionable(
+                'provision_FirmwareUpdate'),
     }
 
     name = 'provision'
@@ -159,7 +161,7 @@
     """
 
     _actions = {
-        'cleanup-reboot': 'generic_RebootTest',
+        'cleanup-reboot': actionables.RebootActionable(),
     }
 
     name = 'cleanup'
@@ -290,8 +292,8 @@
 
     for label in capabilities:
         if task.acts_on(label):
-            test = task.test_for(label)
-            success = job.run_test(test, host=host)
+            action_item = task.test_for(label)
+            success = action_item.execute(job=job, host=host)
             if not success:
                 raise SpecialTaskActionException()
         else:
@@ -300,8 +302,8 @@
 
     for name, value in split_labels(configuration).items():
         if task.acts_on(name):
-            test = task.test_for(name)
-            success = job.run_test(test, host=host, value=value)
+            action_item = task.test_for(name)
+            success = action_item.execute(job=job, host=host, value=value)
             if not success:
                 raise SpecialTaskActionException()
         else: