Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ed23786c: Merge "RRO tests: adapt tests to split apks"

Browse Source 
* commit 'ed23786cc5b19c66c526a576dd39dba720fa5340':
  RRO tests: adapt tests to split apks
This commit is contained in:
Conley Owens
2014-11-26 18:02:38 +00:00
committed by Android Git Automerger
parent 1c48e3029b ed23786cc5
commit c657b302e5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/tests/overlaytests/testrunner.py
View File

@@ -421,8 +421,8 @@ def _create_enable_single_overlay_task():
_create_disable_overlays_task(), _create_disable_overlays_task(),
MkdirTask('/system/vendor'), MkdirTask('/system/vendor'),
MkdirTask('/vendor/overlay'), MkdirTask('/vendor/overlay'),
PushTask('/data/app/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_a.apk'), PushTask('/data/app/com.android.overlaytest.overlay/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_a.apk'),
PushTask('/data/app/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'), PushTask('/data/app/com.android.overlaytest.first_app_overlay/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'),
] ]
return CompoundTask(TASK_ENABLE_SINGLE_OVERLAY, tasks) return CompoundTask(TASK_ENABLE_SINGLE_OVERLAY, tasks)
@@ -432,9 +432,9 @@ def _create_enable_multiple_overlays_task():
MkdirTask('/system/vendor'), MkdirTask('/system/vendor'),
MkdirTask('/vendor/overlay'), MkdirTask('/vendor/overlay'),
PushTask('/data/app/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_b.apk'), PushTask('/data/app/com.android.overlaytest.overlay/com.android.overlaytest.overlay.apk', '/vendor/overlay/framework_b.apk'),
PushTask('/data/app/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'), PushTask('/data/app/com.android.overlaytest.first_app_overlay/com.android.overlaytest.first_app_overlay.apk', '/vendor/overlay/app_a.apk'),
PushTask('/data/app/com.android.overlaytest.second_app_overlay.apk', '/vendor/overlay/app_b.apk'), PushTask('/data/app/com.android.overlaytest.second_app_overlay/com.android.overlaytest.second_app_overlay.apk', '/vendor/overlay/app_b.apk'),
] ]
return CompoundTask(TASK_ENABLE_MULTIPLE_OVERLAYS, tasks) return CompoundTask(TASK_ENABLE_MULTIPLE_OVERLAYS, tasks)
@@ -584,7 +584,7 @@ if __name__ == '__main__':
# remount filesystem, install test project # remount filesystem, install test project
tasks.append(RootTask()) tasks.append(RootTask())
tasks.append(RemountTask()) tasks.append(RemountTask())
tasks.append(PushTask('/system/app/OverlayTest.apk', '/system/app/OverlayTest.apk')) tasks.append(PushTask('/system/app/OverlayTest/OverlayTest.apk', '/system/app/OverlayTest.apk'))
# test idmap # test idmap
if opts.test_idmap: if opts.test_idmap:
@@ -609,9 +609,9 @@ if __name__ == '__main__':
tasks.append(GrepIdmapTest(idmap, 'bool/config_annoy_dianne', 1)) tasks.append(GrepIdmapTest(idmap, 'bool/config_annoy_dianne', 1))
# overlays.list # overlays.list
overlays_list_path = '/data/resource-cache/overlays.list' overlays_list_path = idmaps + '/overlays.list'
expected_content = '''\ expected_content = '''\
/vendor/overlay/framework_b.apk /data/resource-cache/vendor@overlay@framework_b.apk@idmap /vendor/overlay/framework_b.apk /data/local/tmp/idmaps/vendor@overlay@framework_b.apk@idmap
''' '''
tasks.append(FileExistsTest(overlays_list_path)) tasks.append(FileExistsTest(overlays_list_path))
tasks.append(Md5Test(overlays_list_path, expected_content)) tasks.append(Md5Test(overlays_list_path, expected_content))