You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/08/13 18:27:24 UTC
[ignite-teamcity-bot] branch master updated: Resurrected fixed
defect problem resolved, new contributed tests are now failure for board
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new e328bcb Resurrected fixed defect problem resolved, new contributed tests are now failure for board
e328bcb is described below
commit e328bcb5ce2e1b250836c77c0bd9b05f0ea524eb
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Aug 13 21:27:16 2019 +0300
Resurrected fixed defect problem resolved, new contributed tests are now failure for board
---
.../ignite/tcbot/engine/board/BoardService.java | 19 +++++++++++++------
.../ignite/tcbot/engine/defect/DefectIssue.java | 4 ++++
.../ignite/tcbot/engine/defect/DefectsStorage.java | 5 ++++-
.../ignite/tcbot/engine/ui/BoardDefectSummaryUi.java | 2 +-
4 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/board/BoardService.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/board/BoardService.java
index 71e516c..4b546d4 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/board/BoardService.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/board/BoardService.java
@@ -121,11 +121,16 @@ public class BoardService {
defectUi.addFixedIssue();
else
defectUi.addNotFixedIssue();
- } else
- defectUi.addUnclearIssue();
+ } else {
+ //exception for new test. removal of test means test is fixed
+ if(IssueType.newContributedTestFailure.code().equals(compactor.getStringFromId(issue.issueTypeCode())))
+ defectUi.addFixedIssue();
+ else
+ defectUi.addUnclearIssue();
+ }
String testOrBuildName = compactor.getStringFromId(issue.testNameCid());
- defectUi.addIssue(testOrBuildName, "");
+ defectUi.addIssue(testOrBuildName);
}
} else
defectUi.addUnclearIssue();
@@ -148,7 +153,7 @@ public class BoardService {
Stream<Issue> stream = issuesStorage.allIssues();
//todo make property how old issues can be considered as configuration parameter
- long minIssueTs = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(5);
+ long minIssueTs = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7);
//todo not so good to to call init() twice
fatBuildDao.init();
@@ -163,8 +168,10 @@ public class BoardService {
return detected >= minIssueTs;
})
.filter(issue -> {
- String type = issue.type;
- return !IssueType.newContributedTestFailure.code().equals(type);
+ //String type = issue.type;
+ //return !IssueType.newContributedTestFailure.code().equals(type);
+
+ return true;
})
.forEach(issue -> {
cntIssues.incrementAndGet();
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectIssue.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectIssue.java
index 62304ec..5ee60c7 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectIssue.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectIssue.java
@@ -48,4 +48,8 @@ public class DefectIssue {
public int testNameCid() {
return testOrSuiteName;
}
+
+ public int issueTypeCode() {
+ return issueTypeCode;
+ }
}
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectsStorage.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectsStorage.java
index b57bac5..9a6aa1d 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectsStorage.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/defect/DefectsStorage.java
@@ -84,7 +84,9 @@ public class DefectsStorage {
IgniteCache<Integer, DefectCompacted> cache = cache();
try (QueryCursor<Cache.Entry<Integer, DefectCompacted>> qry = cache.query(new ScanQuery<Integer, DefectCompacted>()
- .setFilter((k, v) -> v.resolvedByUsernameId() < 1 && v.tcSrvId() == srvId))) {
+ .setFilter((k, v) -> v.tcSrvId() == srvId))) {
+ //here we ignore if issue was resolved or not because defect can be already resolved,
+ // and if this(resolved) defect contains same build ID, as we've used earlier, no reason to open new defect for it.
for (Cache.Entry<Integer, DefectCompacted> next : qry) {
DefectCompacted openDefect = next.getValue();
@@ -138,6 +140,7 @@ public class DefectsStorage {
defect.id(id);
+ //todo check equals/hashcode before saving
cache.put(id, defect);
return defect;
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/BoardDefectSummaryUi.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/BoardDefectSummaryUi.java
index 5cd1a13..aa70e94 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/BoardDefectSummaryUi.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/BoardDefectSummaryUi.java
@@ -103,7 +103,7 @@ public class BoardDefectSummaryUi {
return defect.id();
}
- public void addIssue(String testOrBuildName, String trackedBranchName) {
+ public void addIssue(String testOrBuildName) {
if (cntIssues == null)
cntIssues = 0;