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/06 11:17:38 UTC
[ignite-teamcity-bot] branch master updated: Tests fix & version
updated
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 aa2ca9f Tests fix & version updated
aa2ca9f is described below
commit aa2ca9f5771d0f5b419a88db3040624d8bba1ac7
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Aug 6 14:17:30 2019 +0300
Tests fix & version updated
---
.../src/main/java/org/apache/ignite/ci/web/model/Version.java | 2 +-
.../org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java | 10 ++++++----
.../ignite/tcignited/IgnitedTcInMemoryIntegrationTest.java | 1 +
.../ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java | 5 +++++
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
index 0fbf12d..97b2e42 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java
@@ -28,7 +28,7 @@ package org.apache.ignite.ci.web.model;
public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot";
/** TC Bot Version. */
- public static final String VERSION = "20190804";
+ public static final String VERSION = "20190805";
/** Java version, where Web App is running. */
public String javaVer;
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
index 1443ff0..a8cdde3 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.OptionalInt;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Stream;
import org.apache.ignite.tcservice.ITeamcity;
import org.apache.ignite.tcbot.engine.conf.BranchTracked;
import org.apache.ignite.tcbot.engine.conf.ChainAtServerTracked;
@@ -143,25 +144,26 @@ public class IssueDetectorTest {
IStringCompactor c,
Map<String, String> pds1Hist,
Map<String, String> buildWoChanges) {
- OptionalInt longestHist = pds1Hist.values().stream().mapToInt(String::length).max();
+ OptionalInt longestHist = Stream.concat(pds1Hist.values().stream(),
+ buildWoChanges.values().stream()).mapToInt(String::length).max();
Preconditions.checkState(longestHist.isPresent());
int histLen = longestHist.getAsInt();
for (int i = 0; i < histLen; i++) {
FatBuildCompacted pds1Build
- = createFatBuild(c, "PDS1", ITeamcity.DEFAULT, 1100 + i, 1000 * i, false)
+ = createFatBuild(c, "PDS1", ITeamcity.DEFAULT, 1100 + i, 100 * i, false)
.addTests(c, testsMapToXmlModel(pds1Hist, histLen, i), null)
.changes(new int[] {i});
apacheBuilds.put(pds1Build.id(), pds1Build);
FatBuildCompacted pds2Build
- = createFatBuild(c, "PDS2_noChanges", ITeamcity.DEFAULT, 1200 + i, 1000 * i, false)
+ = createFatBuild(c, "PDS2_noChanges", ITeamcity.DEFAULT, 1200 + i, 100 * i, false)
.addTests(c, testsMapToXmlModel(buildWoChanges, histLen, i), null);
apacheBuilds.put(pds2Build.id(), pds2Build);
- FatBuildCompacted chainBuild = createFatBuild(c, chainId, ITeamcity.DEFAULT, 1000 + i, 1000 * i, false)
+ FatBuildCompacted chainBuild = createFatBuild(c, chainId, ITeamcity.DEFAULT, 1000 + i, 100 * i, false)
.snapshotDependencies(new int[] {pds1Build.id(), pds2Build.id()});
apacheBuilds.put(chainBuild.id(), chainBuild);
}
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/tcignited/IgnitedTcInMemoryIntegrationTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/tcignited/IgnitedTcInMemoryIntegrationTest.java
index 1b34e77..03a490e 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/tcignited/IgnitedTcInMemoryIntegrationTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/tcignited/IgnitedTcInMemoryIntegrationTest.java
@@ -436,6 +436,7 @@ public class IgnitedTcInMemoryIntegrationTest {
@Override protected void configure() {
bind(Ignite.class).toInstance(ignite);
bind(IStringCompactor.class).to(IgniteStringCompactor.class).in(new SingletonScope());
+ bind(IDataSourcesConfigSupplier.class).toInstance(Mockito.mock(IDataSourcesConfigSupplier.class));
bind(ILogProductSpecific.class).toInstance(Mockito.mock(ILogProductSpecific.class));
}
});
diff --git a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
index 97ca64c..c61a9a7 100644
--- a/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
+++ b/tcbot-teamcity-ignited/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
@@ -24,6 +24,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import javax.annotation.Nullable;
import org.apache.ignite.tcbot.common.TcBotConst;
import org.apache.ignite.tcignited.history.ChangesState;
@@ -188,7 +189,11 @@ public class RunHistCompacted implements IRunHistory {
/** {@inheritDoc} */
@Override public String toString() {
+ Stream<CharSequence> stream = data.getLatestRuns().stream().filter(Objects::nonNull).map(Object::toString);
+ String join = String.join("", stream::iterator);
+
return MoreObjects.toStringHelper(this)
+ .add("runs", join)
.add("failRate", getFailPercentPrintable())
.add("data", data)
.toString();