Skip to content
Permalink
Browse files

[JENKINS-29603] Fixing failing tests added on master branch

  • Loading branch information
zonArt authored and MarkEWaite committed Aug 30, 2016
1 parent 1db52c4 commit b184f2b46eb2b0cb6e0274b28e138f39c7be1c68
Showing with 2 additions and 4 deletions.
  1. +2 −4 src/test/java/hudson/plugins/git/GitStatusTest.java
@@ -163,9 +163,7 @@ public void testDoNotifyCommitWithTwoBranches() throws Exception {
this.gitStatus.doNotifyCommit(requestWithNoParameter, "a", "master,topic,feature/def", null);
Mockito.verify(aMasterTrigger).run();
Mockito.verify(aTopicTrigger).run();
// trigger containing slash is not called in current code, should be
// JENKINS-29603 may be related
Mockito.verify(aFeatureTrigger, Mockito.never()).run();
Mockito.verify(aFeatureTrigger).run();

Mockito.verify(bMasterTrigger, Mockito.never()).run();
Mockito.verify(bTopicTrigger, Mockito.never()).run();
@@ -198,7 +196,7 @@ public void testDoNotifyCommitWithSlashesInBranchNames() throws Exception {
SCMTrigger aSlashesTrigger = setupProjectWithTrigger("a", "name/with/slashes", false);

this.gitStatus.doNotifyCommit(requestWithParameter, "a", "name/with/slashes", null);
Mockito.verify(aSlashesTrigger, Mockito.never()).run(); // Should be run
Mockito.verify(aSlashesTrigger).run();
Mockito.verify(bMasterTrigger, Mockito.never()).run();

assertEquals("URL: a Branches: name/with/slashes", this.gitStatus.toString());

0 comments on commit b184f2b

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