diff --git a/pom.xml b/pom.xml index ba0ef70..4c098ba 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,7 @@ 2.361.4 + 11 TestComplete diff --git a/src/main/java/com/smartbear/jenkins/plugins/testcomplete/TcTestBuilder.java b/src/main/java/com/smartbear/jenkins/plugins/testcomplete/TcTestBuilder.java index d3b7472..b46d682 100644 --- a/src/main/java/com/smartbear/jenkins/plugins/testcomplete/TcTestBuilder.java +++ b/src/main/java/com/smartbear/jenkins/plugins/testcomplete/TcTestBuilder.java @@ -685,6 +685,9 @@ public void performInternal(Run run, FilePath filePath, Launcher launcher, boolean useSessionCreator = chosenInstallation.hasExtendedCommandLine() && (!needToUseService); + TcLog.info(listener, "Log file: %s", workspace.getMasterLogXFilePath().getName()); + + // Making the command line List passwordsToMask = new ArrayList<>(); ArgumentListBuilder args = makeCommandLineArgs(run, launcher, listener, workspace, chosenInstallation, useSessionCreator, passwordsToMask); @@ -723,6 +726,15 @@ public void performInternal(Run run, FilePath filePath, Launcher launcher, } } + //Prefilight check, check if project file exists + FilePath projectFile = new FilePath(workspace.getSlaveWorkspacePath(), env.expand(getSuite())); + if(!projectFile.exists() || projectFile.isDirectory()) { + TcLog.error(listener, Messages.TcTestBuilder_UnableToFindProjectFile(), projectFile.getRemote()); + run.setResult(Result.FAILURE); + return; + } + + // TC/TE launching and data processing TcReportAction tcReportAction = Optional.ofNullable(filePath) .map(fpath -> fpath.toComputer()) @@ -1113,9 +1125,9 @@ private void processFiles(TcInstallation installation, Run run, VirtualCha } } else { - TcLog.warning(listener, Messages.TcTestBuilder_UnableToFindLogFile(), + TcLog.error(listener, Messages.TcTestBuilder_UnableToFindLogFile(), workspace.getSlaveLogXFilePath().getName()); - + run.setResult(Result.FAILURE); testResult.setLogInfo(new TcLogInfo(startTime, 0, 0, 1, 0)); } diff --git a/src/main/resources/com/smartbear/jenkins/plugins/testcomplete/Messages.properties b/src/main/resources/com/smartbear/jenkins/plugins/testcomplete/Messages.properties index b02dc95..958e72b 100644 --- a/src/main/resources/com/smartbear/jenkins/plugins/testcomplete/Messages.properties +++ b/src/main/resources/com/smartbear/jenkins/plugins/testcomplete/Messages.properties @@ -38,6 +38,7 @@ TcTestBuilder.NotWindowsOS = TestComplete/TestExecute can be launched only on th TcTestBuilder.InvalidTimeoutValue = Invalid timeout value: "%s". The default timeout will be used. TcTestBuilder.InstallationNotFound = Unable to find the specified TestComplete/TestExecute installation. +TcTestBuilder.UnableToFindProjectFile = Unable to find the project file "%s". TcTestBuilder.UnableToFindLogFile = Unable to find the log file "%s". TcTestBuilder.ErrorMessage = Error: %s. TcTestBuilder.RemoteCallingFailed = An error occurred while executing code on the test machine (slave): %s.