diff options
| author | rnephew <rnephew@chromium.org> | 2015-09-16 16:17:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 23:17:28 +0000 |
| commit | 06c213ed70d075d70554ec80bdffa17d0fc9ca8c (patch) | |
| tree | 0393011006dec02730c1f2518d8faf428a0cb080 /build | |
| parent | 0ac9fc3e3ae30d1ba49b219302aab6529b03c7dd (diff) | |
| download | chromium_src-06c213ed70d075d70554ec80bdffa17d0fc9ca8c.zip chromium_src-06c213ed70d075d70554ec80bdffa17d0fc9ca8c.tar.gz chromium_src-06c213ed70d075d70554ec80bdffa17d0fc9ca8c.tar.bz2 | |
[Android] Set Permission after app data is cleared on gtests
BUG=
Review URL: https://codereview.chromium.org/1345243002
Cr-Commit-Position: refs/heads/master@{#349272}
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/gtest/test_package.py | 3 | ||||
| -rw-r--r-- | build/android/pylib/gtest/test_package_apk.py | 7 | ||||
| -rw-r--r-- | build/android/pylib/gtest/test_runner.py | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/build/android/pylib/gtest/test_package.py b/build/android/pylib/gtest/test_package.py index b43f858..d21360fb9 100644 --- a/build/android/pylib/gtest/test_package.py +++ b/build/android/pylib/gtest/test_package.py @@ -75,3 +75,6 @@ class TestPackage(object): directory: The host directory to which files should be pulled. """ raise NotImplementedError('Method must be overridden.') + + def SetPermissions(self, device): + pass diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py index 6421803..1a65be5 100644 --- a/build/android/pylib/gtest/test_package_apk.py +++ b/build/android/pylib/gtest/test_package_apk.py @@ -10,6 +10,7 @@ import os import sys import time +from devil.android import apk_helper from devil.android import device_errors from devil.android.sdk import intent from pylib import constants @@ -160,3 +161,9 @@ class TestPackageApk(TestPackage): def PullAppFiles(self, device, files, directory): local_device_gtest_run.PullAppFilesImpl( device, self._package_info.package, files, directory) + + #override + def SetPermissions(self, device): + permissions = apk_helper.ApkHelper(self.suite_path).GetPermissions() + device.GrantPermissions( + apk_helper.GetPackageName(self.suite_path), permissions) diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py index dbcb561..28db85b 100644 --- a/build/android/pylib/gtest/test_runner.py +++ b/build/android/pylib/gtest/test_runner.py @@ -177,6 +177,7 @@ class TestRunner(base_test_runner.BaseTestRunner): self.test_package.ClearApplicationState(self.device) self.test_package.CreateCommandLineFileOnDevice( self.device, test, self._test_arguments) + self.test_package.SetPermissions(self.device) test_results = self._ParseTestOutput( self.test_package.SpawnTestProcess(self.device)) if self._app_data_files: |