Revert "autotest: Set NOT_CONNECTED/WRONG_CONFIG/BROKEN as result of creating ServoHost"
This reverts commit 2c01d45b6c83bf63dfeefcd3b8ba274e8c96b024.
Reason for revert: This is breaking FAFT testing.
Please see chromium:1059391 for details.
BUG=chrominum:1059391
Original change's description:
> autotest: Set NOT_CONNECTED/WRONG_CONFIG/BROKEN as result of creating ServoHost
>
> Servo repair/verify can set WORKING/BROKEN/NOT_CONNECTED/WRONG_CONFIG as servo_state value.
>
> BUG=chrominum:1012504
> TEST=unittest
>
> Change-Id: I01ffc1544da49b7a39c63ec9686b378d00bebd01
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2076696
> Tested-by: Otabek Kasimov <[email protected]>
> Auto-Submit: Otabek Kasimov <[email protected]>
> Reviewed-by: Garry Wang <[email protected]>
> Commit-Queue: Otabek Kasimov <[email protected]>
Bug: chrominum:1012504
Change-Id: Ifbe84c8319b4c5e7c291cecdc49c30db607e566f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2091930
Tested-by: Shelley Chen <[email protected]>
Reviewed-by: Shelley Chen <[email protected]>
Commit-Queue: Shelley Chen <[email protected]>
diff --git a/server/hosts/cros_host_unittest.py b/server/hosts/cros_host_unittest.py
index cc75493..9dd4bc9 100755
--- a/server/hosts/cros_host_unittest.py
+++ b/server/hosts/cros_host_unittest.py
@@ -119,23 +119,24 @@
host._servo_host.get_servo.return_value = 'Not Empty'
host._servo_host.get_servo_state.return_value = 'SOME_STATE'
host.host_info_store = host_info.InMemoryHostInfoStore()
+ self.assertEqual(host.host_info_store.get().get_label_value(SERVO_STATE_PREFIX), '')
return host
def test_do_not_update_label_when_servo_host_is_not_inited(self):
host = self.create_host()
host._servo_host = None
- host.set_servo_state('some_status')
- self.assertEqual(host.host_info_store.get().get_label_value(SERVO_STATE_PREFIX), 'some_status')
-
- def test_do_not_update_label_when_servo_state_is_None(self):
- host = self.create_host()
-
- host.set_servo_state(None)
- host._servo_host.get_servo_state.assert_not_called()
+ host._update_servo_labels()
self.assertEqual(host.host_info_store.get().get_label_value(SERVO_STATE_PREFIX), '')
- def test_repair_servo_set_servo_state_after_repair_when_repair_is_fail(self):
+ def test_do_not_update_label_when_servo_host_is_inited(self):
+ host = self.create_host()
+
+ host._update_servo_labels()
+ host._servo_host.get_servo_state.assert_called()
+ self.assertEqual(host.host_info_store.get().get_label_value(SERVO_STATE_PREFIX), 'SOME_STATE')
+
+ def test_repair_servo__update_servo_labels_after_repair_when_repair_is_fail(self):
host = self.create_host()
host._servo_host.repair.side_effect = Exception('Something bad')
@@ -147,7 +148,7 @@
host._servo_host.get_servo_state.assert_called()
self.assertEqual(host.host_info_store.get().get_label_value(SERVO_STATE_PREFIX), 'SOME_STATE')
- def test_repair_servo_set_servo_state_after_repair_when_repair_is_not_fail(self):
+ def test_repair_servo__update_servo_labels_after_repair_when_repair_is_not_fail(self):
host = self.create_host()
try:
host.repair_servo()
@@ -172,24 +173,6 @@
host._servo_host.get_servo_state.assert_called()
self.assertEqual(host.host_info_store.get().get_label_value(SERVO_STATE_PREFIX), 'SOME_STATE')
- def test_set_servo_host_use_passed_servo_state_when_host_is_None(self):
- host = self.create_host()
-
- host.set_servo_host(None, 'passed_State')
- self.assertEqual(host.host_info_store.get().get_label_value(SERVO_STATE_PREFIX), 'passed_State')
-
- def test_set_servo_host_use_servo_state_from_host_when_host_is_passed(self):
- host = self.create_host()
- servo_host = mock.Mock()
- servo_host.get_servo.return_value = 'Not Empty'
- servo_host.get_servo_state.return_value = 'state_of_host'
-
- host.set_servo_host(servo_host)
- self.assertEqual(host.host_info_store.get().get_label_value(SERVO_STATE_PREFIX), 'state_of_host')
-
- servo_host.get_servo_state.return_value = 'state_of_host2'
- host.set_servo_host(servo_host, 'passed_State')
- self.assertEqual(host.host_info_store.get().get_label_value(SERVO_STATE_PREFIX), 'state_of_host2')
if __name__ == "__main__":
unittest.main()
