Skip to content

Commit 485cec1

Browse files
author
Kendar
committed
Fix globaltest
1 parent f0a3d28 commit 485cec1

File tree

2 files changed

+8
-9
lines changed
  • globaltest
    • globaltest-lib/src/main/java/org/kendar/globaltest
    • globaltest-main/src/main/java/org/kendar/globaltest

2 files changed

+8
-9
lines changed

globaltest/globaltest-lib/src/main/java/org/kendar/globaltest/LogWriter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ private static String getCurrentLocalDateTimeStamp() {
1818
}
1919
public static void info(String data,Object ... pars){
2020
if(pars.length>0){
21-
System.out.println(getCurrentLocalDateTimeStamp()+" [INFO] "+String.format(data,pars));
21+
System.out.println("[INFO] "+String.format(data,pars));
2222
}else{
23-
System.out.println(getCurrentLocalDateTimeStamp()+" [INFO] "+data);
23+
System.out.println("[INFO] "+data);
2424
}
2525
}
2626
public static void warn(String data,Object ... pars){
2727
if(pars.length>0){
28-
System.out.println(getCurrentLocalDateTimeStamp()+" [WARN] "+String.format(data,pars));
28+
System.out.println("[WARN] "+String.format(data,pars));
2929
}else{
30-
System.out.println(getCurrentLocalDateTimeStamp()+" [WARN] "+data);
30+
System.out.println("[WARN] "+data);
3131
}
3232
}
3333
public static void errror(String data,Object ... pars){
3434
if(pars.length>0){
35-
System.err.println(getCurrentLocalDateTimeStamp()+" [ERROR] "+String.format(data,pars));
35+
System.err.println("[ERROR] "+String.format(data,pars));
3636
}else{
37-
System.err.println(getCurrentLocalDateTimeStamp()+" [ERROR] "+data);
37+
System.err.println("[ERROR] "+data);
3838
}
3939
}
4040
private static final Path path;

globaltest/globaltest-main/src/main/java/org/kendar/globaltest/Main.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ public static void main(String[] args) {
268268

269269
buildDeploymentArtifacts(startingPath, hamVersion, buildDir, releasePath);
270270
testAndGenerateJacoco(startingPath);
271-
exit(0);
272271
applyReleasePermissions(releasePath);
273272
testLocalHam(releasePath);
274273
testCalendarSample(calendarPath);
@@ -291,12 +290,12 @@ private static void testAndGenerateJacoco(String startingPath) throws Exception
291290
LogWriter.info("Unit test ham & report");
292291
start(pathOf(startingPath, "scripts", "globaltest"), "test.run", Main::handleRunErrors).run();
293292
if (SystemUtils.IS_OS_WINDOWS) {
294-
HttpChecker.checkForSite(60, "http://127.0.0.1/api/shutdown").noError().run();
293+
HttpChecker.checkForSite(5, "http://127.0.0.1/api/shutdown").noError().run();
295294
_processUtils.sigtermProcesses(findHamProcesses);
296295
} else {
297296
_processUtils.sigtermProcesses(findHamProcesses);
298297
}
299-
var path = Path.of(startingPath, "ham", "api.test", "target", "test_run_starter.exec");
298+
var path = Path.of(startingPath, "ham", "api.test", "target", "jacoco_starter.exec");
300299
var now = System.currentTimeMillis();
301300
var end = now + 5 * 60 * 1000;
302301

0 commit comments

Comments
 (0)