Skip to content

Commit 9af7214

Browse files
committed
Adjusting tests to 3aae137
1 parent 3aae137 commit 9af7214

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/test/java/org/jenkinsci/plugins/workflow/libs/LibraryAdderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ public void parallelBuildsDontInterfereWithExpiredCache() throws Throwable {
505505
r.assertLogContains("global library root", b);
506506
// Second build should succeed and cache the global library at the root level
507507
b = r.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0));
508-
r.assertLogContains("Library global@master is cached. Copying from home.", b);
508+
r.assertLogContains("Library global@master is cached. Copying from cache.", b);
509509
r.assertLogContains("global library root", b);
510510
// Simulate an error which leaves the cache directory empty
511511
FilePath globalCacheDir = LibraryCachingConfiguration.getGlobalLibrariesCacheDir();
@@ -523,7 +523,7 @@ public void parallelBuildsDontInterfereWithExpiredCache() throws Throwable {
523523
r.assertLogContains("global library root", b);
524524
// Third build should succeed and cache the global library at the root level again
525525
b = r.assertBuildStatus(Result.SUCCESS, p.scheduleBuild2(0));
526-
r.assertLogContains("Library global@master is cached. Copying from home.", b);
526+
r.assertLogContains("Library global@master is cached. Copying from cache.", b);
527527
r.assertLogContains("global library root", b);
528528
}
529529
// Change the library path to lib1 - build should succeed and cache the global library at the lib1 level

src/test/java/org/jenkinsci/plugins/workflow/libs/ResourceStepTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class ResourceStepTest {
8383

8484
WorkflowRun secondBuild = r.buildAndAssertSuccess(p);
8585
r.assertLogContains("got fixed contents", secondBuild);
86-
r.assertLogContains("Library stuff@master is cached. Copying from home.", secondBuild);
86+
r.assertLogContains("Library stuff@master is cached. Copying from cache.", secondBuild);
8787
r.assertLogNotContains("git", secondBuild); // git is not called
8888
}
8989

@@ -127,7 +127,7 @@ public class ResourceStepTest {
127127
modifyCacheTimestamp("stuff", "master", System.currentTimeMillis() - 60000 * 55); // 55 minutes have passed, still cached
128128
WorkflowRun secondBuild = r.buildAndAssertSuccess(p);
129129
r.assertLogContains("got fixed contents", secondBuild);
130-
r.assertLogContains("Library stuff@master is cached. Copying from home.", secondBuild);
130+
r.assertLogContains("Library stuff@master is cached. Copying from cache.", secondBuild);
131131
r.assertLogNotContains("git", secondBuild); // git is not called
132132

133133
modifyCacheTimestamp("stuff", "master", System.currentTimeMillis() - 60000 * 61); // 61 minutes have passed, due for a refresh

0 commit comments

Comments
 (0)