Skip to content

Commit e583e20

Browse files
Ujjwal SrivastavaUjjwal Srivastava
Ujjwal Srivastava
authored and
Ujjwal Srivastava
committed
stop calls to addGifFrameAsyncDelay to prevent collection of screenshots
1 parent 35c3027 commit e583e20

File tree

10 files changed

+35
-11
lines changed

10 files changed

+35
-11
lines changed

agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/AppiumListener.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@ public void testStarted(Description description) {
129129

130130
testRun.addNewTestUnit(ongoingTestUnit);
131131

132-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
132+
if (!testTask.isDisableGifEncoder()) {
133+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
134+
}
133135
performanceTestListener.testStarted(ongoingTestUnit.getTitle());
134136
}
135137

agent/src/main/java/com/microsoft/hydralab/agent/runner/appium/Junit5Listener.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ public void executionStarted(TestIdentifier testIdentifier) {
191191

192192
testRun.addNewTestUnit(ongoingTestUnit);
193193

194-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
194+
if (!testTask.isDisableGifEncoder()) {
195+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
196+
}
195197

196198
performanceTestListener.testStarted(ongoingTestUnit.getTitle());
197199
}

agent/src/main/java/com/microsoft/hydralab/agent/runner/espresso/EspressoTestInfoProcessorListener.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ public void testStarted(TestIdentifier test) {
153153

154154
testRun.addNewTestUnit(ongoingTestUnit);
155155

156-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
156+
if (!testTask.isDisableGifEncoder()) {
157+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
158+
}
157159

158160
performanceTestListener.testStarted(ongoingTestUnit.getTitle());
159161
}

agent/src/main/java/com/microsoft/hydralab/agent/runner/maestro/MaestroListener.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ public void testRunStarted() {
5656
testRunDeviceOrchestrator.setRunningTestName(testRunDevice, "MaestroTest.testRunStarted");
5757
performanceTestListener.testRunStarted();
5858
performanceTestListener.testStarted("MaestroTestCase" + index);
59-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
59+
if (!testTask.isDisableGifEncoder()) {
60+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
61+
}
6062
}
6163

6264
private void initUnitCase(String caseName, int testSeconds) {
@@ -75,7 +77,9 @@ private void initUnitCase(String caseName, int testSeconds) {
7577
testRun.addNewTimeTag(unitIndex + ". " + ongoingTestUnit.getTitle(),
7678
System.currentTimeMillis() - testSeconds * 1000 - recordingStartTimeMillis);
7779
testRunDeviceOrchestrator.setRunningTestName(testRunDevice, ongoingTestUnit.getTitle());
78-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
80+
if (!testTask.isDisableGifEncoder()) {
81+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
82+
}
7983
performanceTestListener.testStarted("MaestroTestCase" + index);
8084
}
8185

agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AdbMonkeyRunner.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ public long runMonkeyTestOnce(TestRunDevice testRunDevice, TestTask testTask, Te
124124
testRun.addNewTestUnit(ongoingMonkeyTest);
125125

126126
logger.info(ongoingMonkeyTest.getTitle());
127-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 2, logger);
127+
if (!testTask.isDisableGifEncoder()) {
128+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 2, logger);
129+
}
128130
//run monkey test
129131
testRun.addNewTimeTag(unitIndex + ". " + ongoingMonkeyTest.getTitle(),
130132
System.currentTimeMillis() - testRun.getTestStartTimeMillis());

agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AppiumMonkeyRunner.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ protected File runAndGetGif(File appiumJarFile, String appiumCommand, TestRunDev
7272
testRun.addNewTimeTag(1 + ". " + ongoingMonkeyTest.getTitle(),
7373
System.currentTimeMillis() - recordingStartTimeMillis);
7474
testRunDeviceOrchestrator.setRunningTestName(testRunDevice, ongoingMonkeyTest.getTitle());
75-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
75+
if (!testTask.isDisableGifEncoder()) {
76+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
77+
}
7678
testRun.setTestStartTimeMillis(System.currentTimeMillis());
7779

7880
performanceTestManagementService.testStarted(ongoingMonkeyTest.getTitle());

agent/src/main/java/com/microsoft/hydralab/agent/runner/python/PythonRunner.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ public long runPythonTest(TestRunDevice testRunDevice, TestTask testTask, TestRu
146146
testRun.addNewTestUnit(ongoingPythonTest);
147147

148148
logger.info(ongoingPythonTest.getTitle());
149-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 2, logger);
149+
if (!testTask.isDisableGifEncoder()) {
150+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 2, logger);
151+
}
150152
//run Python test
151153
testRun.addNewTimeTag(unitIndex + ". " + ongoingPythonTest.getTitle(),
152154
System.currentTimeMillis() - testRun.getTestStartTimeMillis());

agent/src/main/java/com/microsoft/hydralab/agent/runner/smart/SmartRunner.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ public void runSmartTestOnce(int i, TestRunDevice testRunDevice, TestTask testTa
121121
testRun.addNewTimeTag(unitIndex + ". " + ongoingSmartTest.getTitle(), System.currentTimeMillis() - testRun.getTestStartTimeMillis());
122122
testRunDeviceOrchestrator.setRunningTestName(testRunDevice, ongoingSmartTest.getTitle());
123123
logger.info(ongoingSmartTest.getTitle());
124-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 1, logger);
124+
if (!testTask.isDisableGifEncoder()) {
125+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 1, logger);
126+
}
125127

126128
performanceTestManagementService.testStarted(ongoingSmartTest.getTitle());
127129

agent/src/main/java/com/microsoft/hydralab/agent/runner/t2c/T2CRunner.java

+2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,10 @@ private void runT2CJsonTestCase(File jsonFile, TestRunDevice testRunDevice, Test
128128

129129
performanceTestManagementService.testStarted(ongoingTest.getTitle());
130130

131+
131132
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 5, logger);
132133

134+
133135
// Run Test
134136
try {
135137
runAppiumT2CTest(testRunDevice, jsonFile, logger);

agent/src/main/java/com/microsoft/hydralab/agent/runner/xctest/XCTestRunner.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ private ArrayList<String> runXctest(TestRunDevice testRunDevice, Logger logger,
9393
if (testRunDevice.getDeviceInfo() == null) {
9494
throw new RuntimeException("No such device: " + testRunDevice.getDeviceInfo());
9595
}
96-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 0, logger);
96+
if (!testTask.isDisableGifEncoder()) {
97+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 0, logger);
98+
}
9799
StringBuilder argString = new StringBuilder();
98100
Map<String, String> instrumentationArgs = testTask.getTaskRunArgs();
99101
if (instrumentationArgs != null && !instrumentationArgs.isEmpty()) {
@@ -138,7 +140,9 @@ private ArrayList<String> runXctest(TestRunDevice testRunDevice, Logger logger,
138140
out.start();
139141
proc.waitFor();
140142
result = out.getResult();
141-
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 0, logger);
143+
if (!testTask.isDisableGifEncoder()) {
144+
testRunDeviceOrchestrator.addGifFrameAsyncDelay(testRunDevice, agentManagementService.getScreenshotDir(), 0, logger);
145+
}
142146
} catch (Exception e) {
143147
throw new RuntimeException("Execute XCTest failed");
144148
}

0 commit comments

Comments
 (0)