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/05 18:54:11 UTC
[ignite-teamcity-bot] branch show-muted updated: Show muted and
ignored tests mode implementation started, added muted tests to report
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch show-muted
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/show-muted by this push:
new 236077f Show muted and ignored tests mode implementation started, added muted tests to report
236077f is described below
commit 236077f328853ebf30151b33a991c18bd1447a63
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Mon Aug 5 21:54:04 2019 +0300
Show muted and ignored tests mode implementation started, added muted tests to report
---
.../ignite/ci/web/rest/GetChainResultsAsHtml.java | 2 +-
.../ci/web/rest/build/GetBuildTestFailures.java | 2 +-
.../ignite/tcbot/engine/chain/MultBuildRunCtx.java | 5 ++--
.../tcbot/engine/chain/TestCompactedMult.java | 30 ++++++++++++++--------
.../ignite/tcbot/engine/pr/PrChainsProcessor.java | 6 ++---
.../tracked/TrackedBranchChainsProcessor.java | 7 ++---
.../apache/ignite/tcbot/engine/ui/DsChainUi.java | 10 +++++---
.../apache/ignite/tcbot/engine/ui/DsSuiteUi.java | 15 +++++++----
8 files changed, 48 insertions(+), 29 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetChainResultsAsHtml.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetChainResultsAsHtml.java
index 04c493d..db6360f 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetChainResultsAsHtml.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetChainResultsAsHtml.java
@@ -92,7 +92,7 @@ public class GetChainResultsAsHtml {
status.chainName = ctx.suiteName();
IStringCompactor c = injector.getInstance(IStringCompactor.class);
- status.initFromContext(tcIgn, ctx, failRateBranch, c, false, null, null, -1, null);
+ status.initFromContext(tcIgn, ctx, failRateBranch, c, false, null, null, -1, null, false, false);
res.append(showChainAtServerData(status));
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
index 6de270d..316b447 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/build/GetBuildTestFailures.java
@@ -141,7 +141,7 @@ public class GetBuildTestFailures {
if (cnt > 0)
runningUpdates.addAndGet(cnt);
- chainStatus.initFromContext(tcIgnited, ctx, failRateBranch, injector.getInstance(IStringCompactor.class), false, null, null, -1, null);
+ chainStatus.initFromContext(tcIgnited, ctx, failRateBranch, injector.getInstance(IStringCompactor.class), false, null, null, -1, null, false, false);
res.addChainOnServer(chainStatus);
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
index 106daf2..7fb1a87 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/MultBuildRunCtx.java
@@ -711,8 +711,9 @@ public class MultBuildRunCtx implements ISuiteResults {
}
}
- public boolean hasTestToReport(ITeamcityIgnited tcIgnited, Integer baseBranchId) {
- return !getFilteredTests(test -> test.includeIntoReport(tcIgnited, baseBranchId)).isEmpty();
+ public boolean hasTestToReport(ITeamcityIgnited tcIgnited, Integer baseBranchId, boolean showMuted,
+ boolean showIgnored) {
+ return !getFilteredTests(test -> test.includeIntoReport(tcIgnited, baseBranchId, showMuted, showIgnored)).isEmpty();
}
public boolean hasLongRunningTest(int maxSec) {
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/TestCompactedMult.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/TestCompactedMult.java
index 8462bb8..8e6b007 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/TestCompactedMult.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/TestCompactedMult.java
@@ -17,6 +17,13 @@
package org.apache.ignite.tcbot.engine.chain;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
import org.apache.ignite.tcbot.common.TcBotConst;
import org.apache.ignite.tcbot.persistence.IStringCompactor;
import org.apache.ignite.tcignited.ITeamcityIgnited;
@@ -27,14 +34,6 @@ import org.apache.ignite.tcignited.history.IRunStat;
import org.apache.ignite.tcignited.history.ISuiteRunHistory;
import org.apache.ignite.tcservice.model.result.tests.TestOccurrence;
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
-
/**
* Test occurrence merged from several runs.
*/
@@ -173,14 +172,23 @@ public class TestCompactedMult {
/**
* Filter to determine if this test execution should be shown in the report of failures.
- *
- * @param tcIgnited Tc ignited.
+ * @param tcIgnited Tc ignited.
* @param baseBranchId Base branch id.
+ * @param showMuted
+ * @param showIgnored
*/
- public boolean includeIntoReport(ITeamcityIgnited tcIgnited, Integer baseBranchId) {
+ public boolean includeIntoReport(ITeamcityIgnited tcIgnited, Integer baseBranchId,
+ boolean showMuted,
+ boolean showIgnored) {
if (isFailedButNotMuted())
return true;
+ if (showMuted && occurrences.stream().anyMatch(ITest::isMutedTest))
+ return true;
+
+ if (showIgnored && occurrences.stream().anyMatch(ITest::isIgnoredTest))
+ return true;
+
boolean longRun = getAvgDurationMs() > TcBotConst.MAX_NEW_TEST_DURATION_FOR_RUNALL_MS;
if (longRun)
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/pr/PrChainsProcessor.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/pr/PrChainsProcessor.java
index 3781a27..e05285c 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/pr/PrChainsProcessor.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/pr/PrChainsProcessor.java
@@ -166,7 +166,7 @@ public class PrChainsProcessor {
//fail rate reference is always default (master)
chainStatus.initFromContext(tcIgnited, ctx, baseBranchForTc, compactor, false,
- null, null, -1, null); // don't need for PR
+ null, null, -1, null, false, false); // don't need for PR
initJiraAndGitInfo(chainStatus, jiraIntegration, gitHubConnIgnited);
}
@@ -298,7 +298,7 @@ public class PrChainsProcessor {
Integer baseBranchId = compactor.getStringIdIfPresent(normalizedBaseBranch);
Predicate<MultBuildRunCtx> filter = suite ->
- suite.isFailed() || suite.hasTestToReport(tcIgnited, baseBranchId);
+ suite.isFailed() || suite.hasTestToReport(tcIgnited, baseBranchId, false, false);
return fullChainRunCtx
.filteredChildSuites(filter)
@@ -307,7 +307,7 @@ public class PrChainsProcessor {
String suiteComment = ctx.getPossibleBlockerComment(compactor, statInBaseBranch, tcIgnited.config());
- List<ShortTestFailureUi> failures = ctx.getFilteredTests(test -> test.includeIntoReport(tcIgnited, baseBranchId))
+ List<ShortTestFailureUi> failures = ctx.getFilteredTests(test -> test.includeIntoReport(tcIgnited, baseBranchId, false, false))
.stream()
.map(occurrence -> {
ShortTestFailureUi tst = new ShortTestFailureUi().initFrom(occurrence, tcIgnited, baseBranchId);
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/tracked/TrackedBranchChainsProcessor.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/tracked/TrackedBranchChainsProcessor.java
index b21eba2..6decee6 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/tracked/TrackedBranchChainsProcessor.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/tracked/TrackedBranchChainsProcessor.java
@@ -106,9 +106,9 @@ public class TrackedBranchChainsProcessor implements IDetailedStatusForTrackedBr
ITeamcityIgnited tcIgnited = tcIgnitedProv.server(srvCodeOrAlias, creds);
- Map<Integer, Integer> requireParamVal = new HashMap<>();
+ Map<Integer, Integer> requireParamVal = new HashMap<>();
- if(!Strings.isNullOrEmpty(tagForHistSelected)) {
+ if (!Strings.isNullOrEmpty(tagForHistSelected)) {
requireParamVal.putAll(
reverseTagToParametersRequired(tagForHistSelected, srvCodeOrAlias));
}
@@ -150,7 +150,8 @@ public class TrackedBranchChainsProcessor implements IDetailedStatusForTrackedBr
runningUpdates.addAndGet(cnt);
chainStatus.initFromContext(tcIgnited, ctx, baseBranchTc, compactor, calcTrustedTests, tagSelected,
- displayMode, maxDurationSec, requireParamVal);
+ displayMode, maxDurationSec, requireParamVal,
+ showMuted, showIgnored);
return chainStatus;
})
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java
index 49fe56f..cc3345d 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java
@@ -166,7 +166,9 @@ public class DsChainUi {
@Nullable String tagSelected,
@Nullable DisplayMode displayMode,
int maxDurationSec,
- @Nullable Map<Integer, Integer> requireParamVal) {
+ @Nullable Map<Integer, Integer> requireParamVal,
+ boolean showMuted,
+ boolean showIgnored) {
failedTests = 0;
failedToFinish = 0;
totalTests = 0;
@@ -201,7 +203,7 @@ public class DsChainUi {
if (suite.isFailed()
|| dModeToUse == DisplayMode.ShowAllSuites
- || suite.hasTestToReport(tcIgnited, baseBranchId)
+ || suite.hasTestToReport(tcIgnited, baseBranchId, showMuted, showIgnored)
|| suite.hasLongRunningTest(maxDurationSec)) {
DsSuiteUi suiteCurStatus = new DsSuiteUi()
.initFromContext(tcIgnited,
@@ -211,7 +213,9 @@ public class DsChainUi {
true,
calcTrustedTests,
maxDurationSec,
- requireParamVal);
+ requireParamVal,
+ showMuted,
+ showIgnored);
failedTests += suiteCurStatus.failedTests != null ? suiteCurStatus.failedTests : 0;
diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java
index cc4f617..3a95a39 100644
--- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java
+++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java
@@ -132,23 +132,28 @@ public class DsSuiteUi extends ShortSuiteUi {
public boolean success = false;
/**
+ * @param includeTests Include tests - usually {@code true}, but it may be disabled for speeding up VISA collection.
* @param tcIgnited Tc ignited.
* @param suite Suite.
* @param baseBranch Base branch.
* @param compactor String Compactor.
- * @param includeTests Include tests - usually {@code true}, but it may be disabled for speeding up VISA collection.
* @param calcTrustedTests
* @param maxDurationSec 0 or negative means don't indclude. has no effect if tests not included
* @param requireParamVal filtering for runs history based on parameter value selected.
+ * @param showMuted
+ * @param showIgnored
*/
public DsSuiteUi initFromContext(ITeamcityIgnited tcIgnited,
@Nonnull final MultBuildRunCtx suite,
@Nullable final String baseBranch,
@Nonnull IStringCompactor compactor,
- boolean includeTests,
+ boolean includeTest3s,
boolean calcTrustedTests,
int maxDurationSec,
- @Nullable Map<Integer, Integer> requireParamVal) {
+ @Nullable Map<Integer, Integer> requireParamVal,
+ boolean showMuted,
+ boolean showIgnored) {
+
String failRateNormalizedBranch = normalizeBranch(baseBranch);
Integer baseBranchId = compactor.getStringIdIfPresent(failRateNormalizedBranch);
IRunHistory baseBranchHist = suite.history(tcIgnited, baseBranchId, requireParamVal);
@@ -175,10 +180,10 @@ public class DsSuiteUi extends ShortSuiteUi {
webToHist = buildWebLinkToHist(tcIgnited, suite);
webToHistBaseBranch = buildWebLinkToHist(tcIgnited, suite, baseBranch);
- if (includeTests) {
+ if (true) {
List<TestCompactedMult> tests = suite.getFilteredTests(test ->
test.hasLongRunningTest(maxDurationSec)
- || test.includeIntoReport(tcIgnited, baseBranchId) );
+ || test.includeIntoReport(tcIgnited, baseBranchId, showMuted, showIgnored));
Function<TestCompactedMult, Float> function = testCompactedMult -> {
IRunHistory res = testCompactedMult.history(tcIgnited, baseBranchId);