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

Move runShellCommandWithTimeout from UserLifecycleTests to ShellHelper

Browse Source 
Bug: 274491131
Test: atest UserLifecycleTests
Change-Id: I9cfa39f119be60dae98cfab12bfe3f261dec83c0
This commit is contained in:
Yasin Kilicdere
2023-04-25 12:20:42 +01:00
parent 3584f0cac4
commit 304ace5611
2 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
View File

@@ -70,7 +70,6 @@ import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
/**
* Perf tests for user life cycle events.
@@ -1472,7 +1471,8 @@ public class UserLifecycleTests {
private void removeUser(int userId) throws RemoteException {
stopUserAfterWaitingForBroadcastIdle(userId, true);
try {
runShellCommandWithTimeout("pm remove-user -w " + userId, TIMEOUT_IN_SECOND);
ShellHelper.runShellCommandWithTimeout("pm remove-user -w " + userId,
TIMEOUT_IN_SECOND);
} catch (TimeoutException e) {
Log.e(TAG, String.format("Could not remove user %d in %d seconds",
userId, TIMEOUT_IN_SECOND), e);
@@ -1539,7 +1539,7 @@ public class UserLifecycleTests {
private void waitForBroadcastIdle() {
try {
runShellCommandWithTimeout("am wait-for-broadcast-idle", TIMEOUT_IN_SECOND);
ShellHelper.runShellCommandWithTimeout("am wait-for-broadcast-idle", TIMEOUT_IN_SECOND);
} catch (TimeoutException e) {
Log.e(TAG, "Ending waitForBroadcastIdle because it is taking too long", e);
}
@@ -1558,41 +1558,4 @@ public class UserLifecycleTests {
waitForBroadcastIdle();
sleep(tenSeconds);
}
/**
* Runs a Shell command with a timeout, returning a trimmed response.
*/
private String runShellCommandWithTimeout(String command, long timeoutInSecond)
throws TimeoutException {
AtomicReference<Exception> exception = new AtomicReference<>(null);
AtomicReference<String> result = new AtomicReference<>(null);
CountDownLatch latch = new CountDownLatch(1);
new Thread(() -> {
try {
result.set(ShellHelper.runShellCommandRaw(command));
} catch (Exception e) {
exception.set(e);
} finally {
latch.countDown();
}
}).start();
try {
if (!latch.await(timeoutInSecond, TimeUnit.SECONDS)) {
throw new TimeoutException("Command: '" + command + "' could not run in "
+ timeoutInSecond + " seconds");
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
if (exception.get() != null) {
Log.e(TAG, "Command: '" + command + "' failed.", exception.get());
throw new RuntimeException(exception.get());
}
return result.get();
}
}

41
apct-tests/perftests/utils/src/android/perftests/utils/ShellHelper.java
View File

@@ -24,12 +24,53 @@ import androidx.annotation.NonNull;
import androidx.test.InstrumentationRegistry;
import java.io.FileInputStream;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
/**
* Provides Shell-based utilities such as running a command.
*/
public final class ShellHelper {
/**
* Runs a Shell command with a timeout, returning a trimmed response.
*/
@NonNull
public static String runShellCommandWithTimeout(@NonNull String command, long timeoutInSecond)
throws TimeoutException {
AtomicReference<Exception> exception = new AtomicReference<>(null);
AtomicReference<String> result = new AtomicReference<>(null);
CountDownLatch latch = new CountDownLatch(1);
new Thread(() -> {
try {
result.set(runShellCommandRaw(command));
} catch (Exception e) {
exception.set(e);
} finally {
latch.countDown();
}
}).start();
try {
if (!latch.await(timeoutInSecond, TimeUnit.SECONDS)) {
throw new TimeoutException("Command: '" + command + "' could not run in "
+ timeoutInSecond + " seconds");
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
if (exception.get() != null) {
throw new AndroidRuntimeException(exception.get());
}
return result.get();
}
/**
* Runs a Shell command, returning a trimmed response.
*/