Skip to content
Permalink
Browse files

Merge pull request #240 from jglick/schedule-on-submit-JENKINS-31129

[JENKINS-31129] Adapting test to behavioral change
Originally-Committed-As: 120f065d34b8b5ec7207a06db44d44148bb52622
  • Loading branch information...
jglick committed Nov 4, 2015
2 parents c6708ec + b3024f9 commit cc4ba65fc1b97a6e3bcfe5d4d88a806381168dfe
@@ -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>
@@ -69,7 +69,7 @@
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 @@
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());

0 comments on commit cc4ba65

Please sign in to comment.
You can’t perform that action at this time.