Skip to content

Commit e18653e

Browse files
committed
Fix issue with -te flag. Version Bump
1 parent 39d1960 commit e18653e

File tree

5 files changed

+23
-7
lines changed

5 files changed

+23
-7
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## 3.6.3 - 2024/7/25
4+
- Fix issue in which using `-te` prevents Java process from exiting gracefully
5+
36
## 3.5.4 - 2023/11/30
47
- Resolve issue relating to universal executables not being available for all OSs
58

pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.applitools.imagetester</groupId>
66
<artifactId>ImageTester</artifactId>
7-
<version>3.6.2</version>
7+
<version>3.6.4</version>
88
<packaging>jar</packaging>
99
<properties>
1010
<maven.compiler.source>1.8</maven.compiler.source>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>com.applitools</groupId>
6565
<artifactId>eyes-images-java5</artifactId>
66-
<version>5.66.5</version>
66+
<version>5.69.3</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>commons-cli</groupId>
@@ -112,6 +112,11 @@
112112
<version>1.7.32</version>
113113
<scope>compile</scope>
114114
</dependency>
115+
<dependency>
116+
<groupId>com.applitools</groupId>
117+
<artifactId>eyes-sdk-core-java5</artifactId>
118+
<version>5.70.0</version>
119+
</dependency>
115120
</dependencies>
116121
<build>
117122
<finalName>../jars/${project.artifactId}_${project.version}</finalName>

src/main/java/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
Manifest-Version: 1.0
22
Main-Class: com.applitools.imagetester.ImageTester
3-
Implementation-Version: 3.6.2
4-
3+
Implementation-Version: 3.6.4

src/main/java/com/applitools/imagetester/ImageTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.applitools.imagetester.lib.Utils;
2727

2828
public class ImageTester {
29-
private static final String cur_ver = "3.6.2";
29+
private static final String cur_ver = "3.6.4";
3030

3131
public static void main(String[] args) {
3232

src/main/java/com/applitools/imagetester/lib/TestExecutor.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public void enqueue(TestBase test, BatchInfo overrideBatch) {
5656
public void join() {
5757
int total = results_.size();
5858
int curr = 1;
59+
boolean shouldExit = false;
5960
while (!results_.isEmpty()) {
6061
config_.logger.printProgress(curr++, total);
6162
ExecutorResult result = null;
@@ -65,10 +66,18 @@ public void join() {
6566
config_.logger.reportException(e);
6667
} catch (ExecutionException e) {
6768
config_.logger.reportException(e);
69+
shouldExit = true;
6870
if (config_.shouldThrowException) {
6971
throw new RuntimeException("Eyes has reported a mismatch or test failure. \n" +
70-
"This exception is thrown because the '-te' flag was present, \n" +
71-
"which instructs ImageTester to throw exceptions if a test fails, or a mismatch is detected");
72+
"This exception is thrown because the '-te' flag was present, \n" +
73+
"which instructs ImageTester to throw exceptions if a test fails, or a mismatch is detected");
74+
}
75+
} finally {
76+
if (shouldExit) {
77+
executorService_.shutdown();
78+
if (config_.shouldThrowException) {
79+
System.exit(1);
80+
}
7281
}
7382
}
7483

0 commit comments

Comments
 (0)