Merge pull request #64 from oleg-nenashev/JENKINS-7739-follow-ups

[JENKINS-7739] - Fix the failing test
jenkinsci · Aug 19, 2015 · 84bf6f9 · 84bf6f9
2 parents beefbbb + 5724eab
commit 84bf6f9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/test/java/hudson/plugins/promoted_builds/conditions/DownstreamPassConditionTest.java b/src/test/java/hudson/plugins/promoted_builds/conditions/DownstreamPassConditionTest.java
@@ -37,6 +37,7 @@
 import hudson.plugins.promoted_builds.PromotionProcess;
 import hudson.plugins.promoted_builds.Status;
 import hudson.tasks.BuildTrigger;
+import jenkins.model.Jenkins;
 
 public final class DownstreamPassConditionTest {
 
@@ -46,9 +47,9 @@ public final class DownstreamPassConditionTest {
     @Test
     @Bug(7739)
     public void shouldEvaluateUpstreamRecursively() throws Exception {
-        final FreeStyleProject job1 = j.createFreeStyleProject();
-        final FreeStyleProject job2 = j.createFreeStyleProject();
-        final FreeStyleProject job3 = j.createFreeStyleProject();
+        final FreeStyleProject job1 = j.createFreeStyleProject("job1");
+        final FreeStyleProject job2 = j.createFreeStyleProject("job2");
+        final FreeStyleProject job3 = j.createFreeStyleProject("job3");
 
         final JobPropertyImpl property = new JobPropertyImpl(job1);
         job1.addProperty(property);
@@ -58,6 +59,7 @@ public void shouldEvaluateUpstreamRecursively() throws Exception {
 
         job1.getPublishersList().add(new BuildTrigger(job2.getFullName(), Result.SUCCESS));
         job2.getPublishersList().add(new BuildTrigger(job3.getFullName(), Result.SUCCESS));
+        Jenkins.getInstance().rebuildDependencyGraph();
 
         final FreeStyleBuild run1 = j.buildAndAssertSuccess(job1);
         j.waitUntilNoActivity();