Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-65398] terminology update #268

Merged
merged 1 commit into from
Apr 19, 2021
Merged

[JENKINS-65398] terminology update #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/hudson/tasks/junit/TestResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@ public void parse(long buildTime, File baseDir, PipelineTestDetails pipelineTest
if(!parsed) {
long localTime = System.currentTimeMillis();
if(localTime < buildTime-1000) /*margin*/
// build time is in the the future. clock on this slave must be running behind
// build time is in the the future. clock on this agent must be running behind
throw new AbortException(
"Clock on this slave is out of sync with the master, and therefore \n" +
"Clock on this agent is out of sync with the controller, and therefore \n" +
"I can't figure out what test results are new and what are old.\n" +
"Please keep the slave clock in sync with the master.");
"Please keep the agent clock in sync with the controller.");

File f = new File(baseDir,reportFiles[0]);
throw new AbortException(
Expand Down Expand Up @@ -282,11 +282,11 @@ public void parse(long buildTime, Iterable<File> reportFiles, PipelineTestDetail
if(!parsed) {
long localTime = System.currentTimeMillis();
if(localTime < buildTime-1000) /*margin*/
// build time is in the the future. clock on this slave must be running behind
// build time is in the the future. clock on this agent must be running behind
throw new AbortException(
"Clock on this slave is out of sync with the master, and therefore \n" +
"Clock on this agent is out of sync with the controller, and therefore \n" +
"I can't figure out what test results are new and what are old.\n" +
"Please keep the slave clock in sync with the master.");
"Please keep the agent clock in sync with the controller.");

File f = reportFiles.iterator().next();
throw new AbortException(
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/hudson/tasks/test/DefaultTestResultParserImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
*
* <p>
* The instance of the parser will be serialized to the node that performed the build and the parsing will be done
* remotely on that slave.
* remotely on that agent.
*
* @since 1.343
* @author Kohsuke Kawaguchi
Expand All @@ -53,7 +53,7 @@
@Deprecated
public abstract class DefaultTestResultParserImpl extends TestResultParser implements Serializable {
/**
* This method is executed on the slave that has the report files to parse test reports and builds {@link TestResult}.
* This method is executed on the agent that has the report files to parse test reports and builds {@link TestResult}.
*
* @param reportFiles
* List of files to be parsed. Never be empty nor null.
Expand All @@ -77,7 +77,7 @@ public abstract class DefaultTestResultParserImpl extends TestResultParser imple
@Override
public TestResult parseResult(final String testResultLocations, final Run<?,?> build, FilePath workspace, final Launcher launcher, final TaskListener listener) throws InterruptedException, IOException {
return workspace.act(new MasterToSlaveFileCallable<TestResult>() {
final boolean ignoreTimestampCheck = IGNORE_TIMESTAMP_CHECK; // so that the property can be set on the master
final boolean ignoreTimestampCheck = IGNORE_TIMESTAMP_CHECK; // so that the property can be set on the controller
final long buildTime = build.getTimestamp().getTimeInMillis();
final long nowMaster = System.currentTimeMillis();

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/tasks/test/TestResultParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public TestResult parseResult(String testResultLocations,
* <li>
* Examine time stamp of test report files and if those are younger than the build, ignore them.
* This is to ignore test reports created by earlier executions. Take the possible timestamp
* difference in the master/slave into account.
* difference in the controller/agent into account.
* </ul>
*
* @param testResultLocations
Expand Down