Add flag to grant permissions when running tests.

This change automatically adds -g to all adb install commands
for runtest. It also allows users to:
1) Specify '-k' as a command line arg to avoid granting permissions.
2) Declare a test suite as 'requiring permissions' within test_defs

Also fixes a potential bug where continuous="false" would translate
to True in the python code.

Bug: 21327566
Change-Id: I62d14e8106174861397b3fd8caa3e567e3538713

2 files changed, 15 insertions, 0 deletions

diff --git a/testrunner/test_defs/test_suite.py b/testrunner/test_defs/test_suite.py
index d0bd9eef7..5bd9a1972 100644
--- a/testrunner/test_defs/test_suite.py
+++ b/testrunner/test_defs/test_suite.py
@@ -33,6 +33,7 @@ class AbstractTestSuite(object):
     self._description = ''
     self._extra_build_args = ''
     self._is_full_make = False
+    self._is_granted_permissions = True
 
   def GetName(self):
     return self._name
@@ -65,6 +66,14 @@ class AbstractTestSuite(object):
     self._is_continuous = continuous
     return self._is_continuous
 
+  def IsGrantedPermissions(self):
+    """Return true if the test should be granted runtime permissions on install."""
+    return self._is_granted_permissions
+
+  def SetIsGrantedPermissions(self, is_granted_permissions):
+    self._is_granted_permissions = is_granted_permissions
+    return self._is_granted_permissions
+
   def GetSuite(self):
     """Returns the name of test' suite, or None."""
     return self._suite
diff --git a/testrunner/test_defs/xml_suite_helper.py b/testrunner/test_defs/xml_suite_helper.py
index 6cf2e6c8d..6805fcd27 100644
--- a/testrunner/test_defs/xml_suite_helper.py
+++ b/testrunner/test_defs/xml_suite_helper.py
@@ -40,6 +40,7 @@ class XmlSuiteParser(object):
   _DESCRIPTION_ATTR = 'description'
   _EXTRA_BUILD_ARGS_ATTR = 'extra_build_args'
   _FULL_MAKE_ATTR = 'full_make'
+  _GRANTED_PERMISSIONS_ATTR = 'granted_permissions'
 
   def Parse(self, element):
     """Populates common suite attributes from given suite xml element.
@@ -72,6 +73,9 @@ class XmlSuiteParser(object):
     test_suite.SetContinuous(self._ParseAttribute(suite_element,
                                                   self._CONTINUOUS_ATTR,
                                                   False, default_value=False))
+    test_suite.SetIsGrantedPermissions(self._ParseAttribute(suite_element,
+                                                  self._GRANTED_PERMISSIONS_ATTR,
+                                                  False, default_value=True))
     test_suite.SetSuite(self._ParseAttribute(suite_element, self._SUITE_ATTR, False,
                                            default_value=None))
     test_suite.SetDescription(self._ParseAttribute(suite_element,
@@ -88,6 +92,8 @@ class XmlSuiteParser(object):
                       default_value=None):
     if suite_element.hasAttribute(attribute_name):
       value = suite_element.getAttribute(attribute_name)
+      if default_value in (True, False):
+        value = value.lower() == "true"
     elif mandatory:
       error_msg = ('Could not find attribute %s in %s' %
                    (attribute_name, self.TAG_NAME))