Skip to content

add to email new process information #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndreeaDora wants to merge 5 commits into
base: master
Choose a base branch
from
Open

add to email new process information #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
722e805
add to email new process information
May 14, 2015
2736ea1
replace eg_ with vg_
May 25, 2015
0a06c2c
add new test
Jun 10, 2015
350958a
Merge remote-tracking branch 'upstream/master' into 7970_show_new_com…
Jun 10, 2015
6cf75a0
test changes
Jun 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions verigreen-collector-impl/src/main/java/com/verigreen/collector/common/EmailSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,9 @@ public void notifyCommiter(
if(result.equals(VerificationStatus.MERGE_FAILED))
{
status.append(String.format("<tr><td>Merge failed between commits:<td> <b>%s</b> and <b>%s</b></td></td></tr>",parentCommitId.substring(0, 7),commitId.substring(0, 7)));
}
else
} else if(parentCommitId != null) {
status.append(String.format("<tr><td>New process Id:</td><td>vg_%s</td></tr>", parentCommitId));
} else
{
status.append(String.format("<tr><td>Commit Id:</td><td>%s</td></tr>", commitId.substring(0, 7)));
}
Expand Down
14 changes: 13 additions & 1 deletion ...green-collector-impl/src/main/java/com/verigreen/collector/decision/OnFailureHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,19 @@ protected void doHandle() {
_commitItem.getParent().getBranchDescriptor().getCommitId(),
_commitItem.getMergedBranchName()
);
}
} else if(!_commitItem.getChildCommit().isEmpty()){

@rqc rqc May 20, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is some room for refactoring here. You have basically the same call to CollectorApi.getEmailSender().notifyCommiter() twice.

I think that a cleaner way would be to do this check !_commitItem.getChildCommit().isEmpty() within the else { .. } block. And then pass the null value in the method call.

Now I see that you have overloaded the method in EmailSender.java and that takes care of it. However, I wouldn't recommend using a method overloading pattern just pass a null value as an argument. There is really no major change in the overloaded method since you are basically calling the overloaded method. Also, this makes the EmailSender API not as clear about its behavior.

So, do the following. Remove the method in EmailSender.java within lines 68-88 and use the other method to make the call from OnFailureHandler.java.

Does that make sense?

CollectorApi.getEmailSender().notifyCommiter(
_commitItem.getBranchDescriptor().getCommitId(),
_commitItem.getStatus(),
_commitItem.getBuildUrl(),
"Verigreen Status - Failure",
EmailSender.getFailedSignature(),
_commitItem.getBranchDescriptor().getCommitter(),
_commitItem.getBranchDescriptor().getProtectedBranch(),
_commitItem.getChildCommit(),
_commitItem.getMergedBranchName()
);
}
else {
CollectorApi.getEmailSender().notifyCommiter(
_commitItem.getBranchDescriptor().getCommitId(),
Expand Down
77 changes: 77 additions & 0 deletions ...ctor-system-tests/utest/com/verigreen/collector/systemtest/TestCollectorE2EGreenPath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,4 +1375,81 @@ public void testPermittedUsersChangesInRT() throws IOException, InterruptedExcep
Assert.assertTrue(ex instanceof RestClientException);
}
}


@Test
public void testScenario() throws IOException, InterruptedException {
String destinationFolderForNewFile = DEFAULT_COMMIT_FOLDER;

String masterBranchCurrentSHA1 =
((JGitOperator) _sourceControlOperator).getRef(
getBranchRefsRemotesFullName(_masterBranch)).getObjectId().getName();

String commiterName = generateUserName();
String commiterEmail = generateEmailAddress();
String content = getContent("test");
String[] branch = generateBranchNames(1);

setProtectedBranch(_masterBranch);
checkoutExistingBranch(_masterBranch);

String commitId =
commitAndPush(
destinationFolderForNewFile,
commiterName,
commiterEmail,
content,
true,
_masterBranch);

String shortCommitId = processCommitId(commitId, commiterName);
checkSuccessfulyProccesedCommitThatShouldPass(
VerigreenUtils.getVerigreenBranchName(shortCommitId),
_masterBranch,
_timeoutForTestInMilis,
commitId,
commiterName,
commiterEmail,
content,
true);

((JGitOperator) _sourceControlOperator).reset(masterBranchCurrentSHA1);
createAndPushBranches(branch);
checkoutExistingBranch(branch[0]);

commitAndPush(
destinationFolderForNewFile,
commiterName,
commiterEmail,
content,
true,
true,
branch[0]);

checkoutExistingBranch(_masterBranch);
_sourceControlOperator.merge(_masterBranch,_masterBranch);
_sourceControlOperator.merge(_masterBranch, branch[0]);

String commitId3 =
commitAndPush(
destinationFolderForNewFile,
commiterName,
commiterEmail,
content,
true,
_masterBranch);

String shortCommitId3 = processCommitId(commitId3, commiterName);

checkSuccessfulyProccesedCommitThatShouldFail(
VerigreenUtils.getVerigreenBranchName(shortCommitId3),
_masterBranch,
_timeoutForTestInMilis,
commitId3,
commiterName,
commiterEmail,
content,
VerificationStatus.GIT_FAILURE,
true);
}
}