commit 22220c0acc18892a46a63b944c5bb35265e8f529
author Dan Shi <dshi@chromium.org> Fri Jul 10 04:21:36 2015 +0000
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Jul 15 02:04:56 2015 +0000
tree c435fb86932bc306490a8eeaa502d0918603b4c9
parent 63920b7de6db11c656795822bf771c8de8d17d65

Revert "[autotest] Disable rpm action of power_RPMTtest"

This reverts commit d2b82f3e3f142f3086eb32f336f1d47c2136b2d3.

BUG=chromium:502435
TEST=None

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

server/cros/provision.py

diff --git a/server/cros/provision.py b/server/cros/provision.py
index 0435669..7e40466 100644
--- a/server/cros/provision.py
+++ b/server/cros/provision.py
@@ -4,11 +4,8 @@
 
 
 import abc
-import logging
 
 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
 
 
@@ -126,16 +123,7 @@
 
     _actions = {
         '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
-        # anyway due to the destiny lab issue, and test retry will retry the
-        # test in another DUT.
-        # This change temporarily disable the RPM check in reset job.
-        # 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': actionables.TestActionable('dummy_PassServer'),
+        'rpm': actionables.TestActionable('power_RPMTest'),
     }
 
     name = 'verify'