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

Merge "Fix testKeyValue_Concurrency flakyness" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-14 13:59:42 +00:00
committed by Android (Google) Code Review
parent 90122592ff 8527b23eee
commit 52f7022db3
1 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTests.java
View File

@@ -27,6 +27,7 @@ import android.app.trust.TrustManager;
import android.content.pm.UserInfo;
import android.database.sqlite.SQLiteDatabase;
import android.os.FileUtils;
import android.os.SystemClock;
import android.os.UserManager;
import android.os.storage.StorageManager;
import android.platform.test.annotations.Presubmit;
@@ -125,7 +126,7 @@ public class LockSettingsStorageTests extends AndroidTestCase {
List<Thread> threads = new ArrayList<>();
for (int i = 0; i < 100; i++) {
final int threadId = i;
threads.add(new Thread() {
threads.add(new Thread("testKeyValue_Concurrency_" + i) {
@Override
public void run() {
synchronized (monitor) {
@@ -134,17 +135,17 @@ public class LockSettingsStorageTests extends AndroidTestCase {
} catch (InterruptedException e) {
return;
}
mStorage.writeKeyValue("key", "1 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
mStorage.writeKeyValue("key", "2 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
mStorage.writeKeyValue("key", "3 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
mStorage.writeKeyValue("key", "4 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
mStorage.writeKeyValue("key", "5 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
}
mStorage.writeKeyValue("key", "1 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
mStorage.writeKeyValue("key", "2 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
mStorage.writeKeyValue("key", "3 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
mStorage.writeKeyValue("key", "4 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
mStorage.writeKeyValue("key", "5 from thread " + threadId, 0);
mStorage.readKeyValue("key", "default", 0);
}
});
threads.get(i).start();
@@ -153,12 +154,7 @@ public class LockSettingsStorageTests extends AndroidTestCase {
synchronized (monitor) {
monitor.notifyAll();
}
for (int i = 0; i < threads.size(); i++) {
try {
threads.get(i).join();
} catch (InterruptedException e) {
}
}
joinAll(threads, 10000);
assertEquals('5', mStorage.readKeyValue("key", "default", 0).charAt(0));
mStorage.clearCache();
assertEquals('5', mStorage.readKeyValue("key", "default", 0).charAt(0));
@@ -515,4 +511,29 @@ public class LockSettingsStorageTests extends AndroidTestCase {
}
return captured[0];
}
private static void joinAll(List<Thread> threads, long timeoutMillis) {
long deadline = SystemClock.uptimeMillis() + timeoutMillis;
for (Thread t : threads) {
try {
t.join(deadline - SystemClock.uptimeMillis());
if (t.isAlive()) {
t.interrupt();
throw new RuntimeException(
"Joining " + t + " timed out. Stack: \n" + getStack(t));
}
} catch (InterruptedException e) {
throw new RuntimeException("Interrupted while joining " + t, e);
}
}
}
private static String getStack(Thread t) {
StringBuilder sb = new StringBuilder();
sb.append(t.toString()).append('\n');
for (StackTraceElement ste : t.getStackTrace()) {
sb.append("\tat ").append(ste.toString()).append('\n');
}
return sb.toString();
}
}