Merge "Show waiting for boot failure when boot actually fails."
diff --git a/internal/lib/utils.py b/internal/lib/utils.py
index b044d38..1e0ebc4 100755
--- a/internal/lib/utils.py
+++ b/internal/lib/utils.py
@@ -651,22 +651,43 @@
Args:
result:the return value of the target function.
+
+ Returns:
+ _EvaluatedResults namedtuple.
"""
return _EvaluatedResult(is_result_ok=True, result_message=result)
def ReportEvaluator(report):
- """Evalute the the acloud operation by the report.
+ """Evalute the acloud operation by the report.
Args:
- report:acloud.public.report() object.
+ report: acloud.public.report() object.
+
+ Returns:
+ _EvaluatedResults namedtuple.
"""
if report is None or report.errors:
- return _EvaluatedResult(is_result_ok=False, result_message=report.errors)
+ return _EvaluatedResult(is_result_ok=False,
+ result_message=report.errors)
return _EvaluatedResult(is_result_ok=True, result_message=None)
+def BootEvaluator(boot_dict):
+ """Evaluate if the device booted successfully.
+
+ Args:
+ boot_dict: Dict of instance_name:boot error.
+
+ Returns:
+ _EvaluatedResults namedtuple.
+ """
+ if boot_dict:
+ return _EvaluatedResult(is_result_ok=False, result_message=boot_dict)
+ return _EvaluatedResult(is_result_ok=True, result_message=None)
+
+
class TimeExecute(object):
"""Count the function execute time."""
diff --git a/public/actions/common_operations.py b/public/actions/common_operations.py
index dbdd3a2..21181a1 100644
--- a/public/actions/common_operations.py
+++ b/public/actions/common_operations.py
@@ -131,7 +131,8 @@
self.devices.append(
avd.AndroidVirtualDevice(ip=ip, instance_name=instance))
- @utils.TimeExecute(function_description="Waiting for AVD(s) to boot up")
+ @utils.TimeExecute(function_description="Waiting for AVD(s) to boot up",
+ result_evaluator=utils.BootEvaluator)
def WaitForBoot(self):
"""Waits for all devices to boot up.