[JENKINS-31129] Adapting test to behavioral change.

jenkinsci · Nov 4, 2015 · 6fa8d48 · 6fa8d48
1 parent 46d6387
commit 6fa8d48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/multibranch/pom.xml b/multibranch/pom.xml
@@ -60,6 +60,11 @@ THE SOFTWARE.
             <artifactId>branch-api</artifactId>
             <version>0.2-beta-6-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>cloudbees-folder</artifactId>
+            <version>5.1-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>workflow-aggregator</artifactId>

diff --git a/...ava/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactoryTest.java b/...ava/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactoryTest.java
@@ -69,7 +69,7 @@ public class WorkflowMultiBranchProjectFactoryTest {
         OrganizationFolder top = r.jenkins.createProject(OrganizationFolder.class, "top");
         top.getNavigators().add(new GitDirectorySCMNavigator(clones.getAbsolutePath()));
         // Make sure we created one multibranch projects:
-        r.waitUntilNoActivity();
+        top.scheduleBuild2(0).getFuture().get();
         top.getComputation().writeWholeLogTo(System.out);
         assertEquals(1, top.getItems().size());
         MultiBranchProject<?,?> one = top.getItem("one");
@@ -88,6 +88,7 @@ public class WorkflowMultiBranchProjectFactoryTest {
         assertTrue(acl.hasPermission(admin, Item.EXTENDED_READ));
         assertTrue(acl.hasPermission(admin, Item.READ));
         // Check that the master branch project works:
+        r.waitUntilNoActivity();
         WorkflowJob p = WorkflowMultiBranchProjectTest.findBranchProject((WorkflowMultiBranchProject) one, "master");
         WorkflowRun b1 = p.getLastBuild();
         assertEquals(1, b1.getNumber());