Wait some time before emulator stop, diabled emulator log redirection (otherise result reports would be inconsistent)
~emulator
This commit is contained in:
+18
-1
@@ -131,7 +131,8 @@ public class Emulator {
|
|||||||
startServer();
|
startServer();
|
||||||
System.out.println("Starting emulator...");
|
System.out.println("Starting emulator...");
|
||||||
RunUtils.executeOnSeparateThread(new RunUtils.RunSettings(getStartCommand(), null, false, "START: ", true));
|
RunUtils.executeOnSeparateThread(new RunUtils.RunSettings(getStartCommand(), null, false, "START: ", true));
|
||||||
printLog();
|
//disabled cause of missed test results
|
||||||
|
//printLog();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void printLog() {
|
public void printLog() {
|
||||||
@@ -173,6 +174,13 @@ public class Emulator {
|
|||||||
|
|
||||||
public void stopEmulator() {
|
public void stopEmulator() {
|
||||||
System.out.println("Stopping emulator...");
|
System.out.println("Stopping emulator...");
|
||||||
|
try {
|
||||||
|
//added cause of missed test results
|
||||||
|
Thread.sleep(20000);
|
||||||
|
}
|
||||||
|
catch (InterruptedException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
GeneralCommandLine command = createAdbCommand();
|
GeneralCommandLine command = createAdbCommand();
|
||||||
command.addParameter("-s");
|
command.addParameter("-s");
|
||||||
@@ -236,6 +244,15 @@ public class Emulator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String runTestsViaAdb() {
|
||||||
|
System.out.println("Running tests via adb...");
|
||||||
|
GeneralCommandLine adbCommand = createAdbCommand();
|
||||||
|
//adb shell am instrument -w -r org.jetbrains.kotlin.android.tests/android.test.InstrumentationTestRunner
|
||||||
|
adbCommand.addParameters("shell", "am", "instrument", "-w", "-r", "org.jetbrains.kotlin.android.tests/android.test.InstrumentationTestRunner");
|
||||||
|
RunResult execute = RunUtils.execute(adbCommand);
|
||||||
|
return execute.getOutput();
|
||||||
|
}
|
||||||
|
|
||||||
private void stopRedundantEmulators(PathManager pathManager) {
|
private void stopRedundantEmulators(PathManager pathManager) {
|
||||||
GeneralCommandLine commandLineForListOfDevices = createAdbCommand();
|
GeneralCommandLine commandLineForListOfDevices = createAdbCommand();
|
||||||
commandLineForListOfDevices.addParameter("devices");
|
commandLineForListOfDevices.addParameter("devices");
|
||||||
|
|||||||
Reference in New Issue
Block a user