Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-43433] No need to differentiate between MERGE and REBASE
  • Loading branch information
stephenc committed Jun 12, 2017
1 parent 3300e70 commit 809ea04
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -66,7 +66,7 @@

<properties>
<jenkins.version>1.642.3</jenkins.version>
<scm-api.version>2.2.0-20170411.160059-4</scm-api.version>
<scm-api.version>2.2.0-20170420.134709-5</scm-api.version>
</properties>

<repositories>
Expand Down
20 changes: 4 additions & 16 deletions src/test/java/integration/EventsTest.java
Expand Up @@ -402,7 +402,7 @@ public void given_multibranchWithMergeableChangeRequests_when_indexing_then_merg
BasicMultiBranchProject prj = r.jenkins.createProject(BasicMultiBranchProject.class, "foo");
prj.setCriteria(null);
MockSCMSource source = new MockSCMSource(null, c, "foo", false, false, true);
source.setStrategies(EnumSet.of(ChangeRequestCheckoutStrategy.HEAD, ChangeRequestCheckoutStrategy.MERGE, ChangeRequestCheckoutStrategy.REBASE));
source.setStrategies(EnumSet.of(ChangeRequestCheckoutStrategy.HEAD, ChangeRequestCheckoutStrategy.MERGE));
prj.getSourcesList().add(new BranchSource(source));
prj.scheduleBuild2(0).getFuture().get();
r.waitUntilNoActivity();
Expand All @@ -416,17 +416,13 @@ public void given_multibranchWithMergeableChangeRequests_when_indexing_then_merg
assertThat("We have no plan CR", cr, nullValue());
FreeStyleProject crMerge = prj.getItem("CR-" + crNum+"-merge");
assertThat("We now have the merge change request", crMerge, notNullValue());
FreeStyleProject crRebase = prj.getItem("CR-" + crNum+"-rebase");
assertThat("We now have the rebase change request", crRebase, notNullValue());
FreeStyleProject crHead = prj.getItem("CR-" + crNum+"-head");
assertThat("We now have the head change request", crHead, notNullValue());
assertThat("We have change requests but no tags or branches",
prj.getItems(), containsInAnyOrder(crMerge, crRebase, crHead));
prj.getItems(), containsInAnyOrder(crMerge, crHead));
r.waitUntilNoActivity();
assertThat("The merge change request was built", crMerge.getLastBuild(), notNullValue());
assertThat("The merge change request was built", crMerge.getLastBuild().getNumber(), is(1));
assertThat("The rebase change request was built", crRebase.getLastBuild(), notNullValue());
assertThat("The rebase change request was built", crRebase.getLastBuild().getNumber(), is(1));
assertThat("The head change request was built", crHead.getLastBuild(), notNullValue());
assertThat("The head change request was built", crHead.getLastBuild().getNumber(), is(1));
}
Expand All @@ -442,8 +438,7 @@ public void given_multibranchWithMergeableChangeRequests_when_reindexing_then_me
BasicMultiBranchProject prj = r.jenkins.createProject(BasicMultiBranchProject.class, "foo");
prj.setCriteria(null);
MockSCMSource source = new MockSCMSource(null, c, "foo", false, false, true);
source.setStrategies(EnumSet.of(ChangeRequestCheckoutStrategy.HEAD, ChangeRequestCheckoutStrategy.MERGE,
ChangeRequestCheckoutStrategy.REBASE));
source.setStrategies(EnumSet.of(ChangeRequestCheckoutStrategy.HEAD, ChangeRequestCheckoutStrategy.MERGE));
prj.getSourcesList().add(new BranchSource(source));
prj.scheduleBuild2(0).getFuture().get();
r.waitUntilNoActivity();
Expand All @@ -457,17 +452,13 @@ public void given_multibranchWithMergeableChangeRequests_when_reindexing_then_me
assumeThat("We have no plan CR", cr, nullValue());
FreeStyleProject crMerge = prj.getItem("CR-" + crNum+"-merge");
assumeThat("We now have the merge change request", crMerge, notNullValue());
FreeStyleProject crRebase = prj.getItem("CR-" + crNum + "-rebase");
assumeThat("We now have the rebase change request", crRebase, notNullValue());
FreeStyleProject crHead = prj.getItem("CR-" + crNum+"-head");
assumeThat("We now have the head change request", crHead, notNullValue());
assumeThat("We have change requests but no tags or branches",
prj.getItems(), containsInAnyOrder(crMerge, crHead));
r.waitUntilNoActivity();
assumeThat("The merge change request was built", crMerge.getLastBuild(), notNullValue());
assumeThat("The merge change request was built", crMerge.getLastBuild().getNumber(), is(1));
assumeThat("The rebase change request was built", crRebase.getLastBuild(), notNullValue());
assumeThat("The rebase change request was built", crRebase.getLastBuild().getNumber(), is(1));
assumeThat("The head change request was built", crHead.getLastBuild(), notNullValue());
assumeThat("The head change request was built", crHead.getLastBuild().getNumber(), is(1));
c.addFile("foo", "master", "change the target", "file.txt", new byte[]{0});
Expand All @@ -481,15 +472,12 @@ public void given_multibranchWithMergeableChangeRequests_when_reindexing_then_me
assertThat("We still have no plan CR", cr, nullValue());
crMerge = prj.getItem("CR-" + crNum + "-merge");
assertThat("We still have the merge change request", crMerge, notNullValue());
crRebase = prj.getItem("CR-" + crNum + "-rebase");
assertThat("We still have the rebase change request", crRebase, notNullValue());
crHead = prj.getItem("CR-" + crNum + "-head");
assertThat("We still have the head change request", crHead, notNullValue());
assertThat("We still have change requests but no tags or branches",
prj.getItems(), containsInAnyOrder(crMerge, crRebase, crHead));
prj.getItems(), containsInAnyOrder(crMerge, crHead));
r.waitUntilNoActivity();
assertThat("The merge change request was rebuilt", crMerge.getLastBuild().getNumber(), is(2));
assertThat("The rebase change request was rebuilt", crRebase.getLastBuild().getNumber(), is(2));
assertThat("The head change request was not rebuilt", crHead.getLastBuild().getNumber(), is(1));
}
}
Expand Down

0 comments on commit 809ea04

Please sign in to comment.