diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-06 15:58:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-06 15:58:32 -0700 |
| commit | be26ac5835aecd3a2ac7c6245467d9d1345c1b88 (patch) | |
| tree | 4abee17ac8d16195ad620aab1d3ec3e3ffbc317c /tests | |
| parent | 509ca0792b7cb14ddcea7d2c7e83159d0621e725 (diff) | |
| parent | 864ed1a9d7f7a18db7415322728f6208a0eaf9d5 (diff) | |
| download | frameworks_base-be26ac5835aecd3a2ac7c6245467d9d1345c1b88.zip frameworks_base-be26ac5835aecd3a2ac7c6245467d9d1345c1b88.tar.gz frameworks_base-be26ac5835aecd3a2ac7c6245467d9d1345c1b88.tar.bz2 | |
Merge change 20338
* changes:
Wipe data on backend before a backup run Append the date to 3.txt so that we can see if/when backup failures occurred solely from the device/server state Note that these files will probably be deleted from the tree immediately, to be replaced by the ruby versions.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/backup/test_backup.sh | 22 | ||||
| -rwxr-xr-x | tests/backup/test_restore.sh | 5 |
2 files changed, 23 insertions, 4 deletions
diff --git a/tests/backup/test_backup.sh b/tests/backup/test_backup.sh index dd3907c..f50d03f 100755 --- a/tests/backup/test_backup.sh +++ b/tests/backup/test_backup.sh @@ -20,6 +20,18 @@ ADB_OPTS="$@" #FIXME: what was this for? #adb kill-server +b_pkgs=$(adb $ADB_OPTS shell dumpsys backup | \ + ruby -ne 'print($1+" ") if $_ =~ /^\s*ApplicationInfo\{\S+ (.+?)\}/') + +# wipe prior backup data for packages, including the metadata package @pm@ +for pkg in $b_pkgs '@pm@'; do + adb $ADB_OPTS shell bmgr wipe "$pkg" +done + +# who knows? +echo 'Waiting 5 seconds for things to settle...' +sleep 5 + # run adb as root so we can poke at com.android.backuptest's data root_status=$(adb $ADB_OPTS root) if [ "x$root_status" != "xadbd is already running as root" ]; then @@ -35,16 +47,20 @@ adb $ADB_OPTS shell bmgr transport com.google.android.backup/.BackupTransportSer # load up the three files adb $ADB_OPTS shell \ - "rm /data/data/com.android.backuptest/files/* ; \ + "rm /data/data/com.android.backuptest/files/file.txt ; \ + rm /data/data/com.android.backuptest/files/another_file.txt ; \ + rm /data/data/com.android.backuptest/files/empty.txt ; \ mkdir /data/data/com.android.backuptest ; \ mkdir /data/data/com.android.backuptest/files ; \ mkdir /data/data/com.android.backuptest/shared_prefs ; \ - echo -n \"<map><int name=\\\"pref\\\" value=\\\"1\\\" /></map>\" > /data/data com.android.backuptest/shared_prefs/raw.xml ; \ + echo -n \"<map><int name=\\\"pref\\\" value=\\\"1\\\" /></map>\" \ + > /data/data/com.android.backuptest/shared_prefs/raw.xml ; \ echo -n first file > /data/data/com.android.backuptest/files/file.txt ; \ echo -n asdf > /data/data/com.android.backuptest/files/another_file.txt ; \ - echo -n 3 > /data/data/com.android.backuptest/files/3.txt ; \ echo -n "" > /data/data/com.android.backuptest/files/empty.txt ; \ + date >> /data/data/com.android.backuptest/files/3.txt ; \ " +# echo -n 3 > /data/data/com.android.backuptest/files/3.txt ; \ # say that the data has changed adb $ADB_OPTS shell bmgr backup com.android.backuptest diff --git a/tests/backup/test_restore.sh b/tests/backup/test_restore.sh index 8de70cb..44b3a28 100755 --- a/tests/backup/test_restore.sh +++ b/tests/backup/test_restore.sh @@ -70,7 +70,7 @@ echo # check the results check_file files/file.txt "first file" check_file files/another_file.txt "asdf" -check_file files/3.txt "3" +#check_file files/3.txt "3" check_file files/empty.txt "" check_file shared_prefs/raw.xml '<map><int name="pref" value="1" /></map>' @@ -84,3 +84,6 @@ adb $ADB_OPTS shell "ls -l /data/data/com.android.backuptest/shared_prefs" echo --- echo +echo "Last 3 timestamps in 3.txt:" +adb $ADB_OPTS shell cat /data/data/com.android.backuptest/files/3.txt | tail -n 3 + |