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 2018/11/24 12:22:51 UTC
[ignite-teamcity-bot] branch ignite-9542-new-run-stripe updated:
IGNITE-9542: New Run stripe implementation: test development
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9542-new-run-stripe
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9542-new-run-stripe by this push:
new 495b73d IGNITE-9542: New Run stripe implementation: test development
495b73d is described below
commit 495b73ddd31953e577daabbfba79f04c78fde775
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Sat Nov 24 15:21:51 2018 +0300
IGNITE-9542: New Run stripe implementation: test development
---
.../ignite/ci/tcbot/chain/PrChainsProcessor.java | 3 --
.../apache/ignite/ci/tcmodel/hist/BuildRef.java | 5 +++
.../org/apache/ignite/ci/tcmodel/result/Build.java | 1 +
.../ci/tcbot/chain/BuildChainProcessorTest.java | 4 +--
.../ci/tcbot/chain/PrChainsProcessorTest.java | 38 +++++++++++++++++++---
.../ignited/TeamcityIgnitedProviderMock.java | 2 +-
6 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java
index 2699816..8495c41 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java
@@ -187,9 +187,6 @@ public class PrChainsProcessor {
return null;
for (ChainAtServerCurrentStatus server : summary.servers) {
- if (!srvId.equals(server.serverName()))
- continue;
-
Map<String, List<SuiteCurrentStatus>> fails = findFailures(server);
fails.forEach((k, v) -> res.addAll(v));
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/hist/BuildRef.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/hist/BuildRef.java
index 89b0c3b..ad627d3 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/hist/BuildRef.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/hist/BuildRef.java
@@ -200,4 +200,9 @@ public class BuildRef extends AbstractRef {
public boolean isUnknown() {
return STATUS_UNKNOWN.equals(status());
}
+
+ /** */
+ public void setBranchName(String branch) {
+ this.branchName = branch;
+ }
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/result/Build.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/result/Build.java
index 8fec162..f63fe83 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/result/Build.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/result/Build.java
@@ -190,4 +190,5 @@ public class Build extends BuildRef implements IVersionedEntity {
public void snapshotDependencies(List<BuildRef> dependencies) {
snapshotDependencies = dependencies;
}
+
}
\ No newline at end of file
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessorTest.java
index 000661d..22e471a 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessorTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessorTest.java
@@ -193,7 +193,7 @@ public class BuildChainProcessorTest {
builds.put(pds2.id(), pds2);
}
- @NotNull public IAnalyticsEnabledTeamcity tcOldMock() {
+ @NotNull public static IAnalyticsEnabledTeamcity tcOldMock() {
IAnalyticsEnabledTeamcity teamcity = Mockito.mock(IAnalyticsEnabledTeamcity.class);
when(teamcity.getBuildFailureRunStatProvider()).thenReturn(Mockito.mock(Function.class));
when(teamcity.getTestRunStatProvider()).thenReturn(Mockito.mock(Function.class));
@@ -205,7 +205,7 @@ public class BuildChainProcessorTest {
injector.getInstance(IStringCompactor.class));
}
- @NotNull public FatBuildCompacted testFatBuild(IStringCompactor c, int id, String bt) {
+ @NotNull public static FatBuildCompacted testFatBuild(IStringCompactor c, int id, String bt) {
FatBuildCompacted root = new FatBuildCompacted();
BuildRef ref = new BuildRef();
ref.setId(id);
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
index 046a70b..5ed0801 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
@@ -24,6 +24,11 @@ import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
import org.apache.ignite.ci.ITeamcity;
import org.apache.ignite.ci.github.pure.IGitHubConnection;
import org.apache.ignite.ci.github.pure.IGitHubConnectionProvider;
+import org.apache.ignite.ci.tcmodel.hist.BuildRef;
+import org.apache.ignite.ci.tcmodel.result.Build;
+import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence;
+import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrenceFull;
+import org.apache.ignite.ci.tcmodel.result.tests.TestRef;
import org.apache.ignite.ci.teamcity.ignited.*;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider;
@@ -33,6 +38,7 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -65,8 +71,9 @@ public class PrChainsProcessorTest {
final ITcServerProvider tcSrvOldProv = Mockito.mock(ITcServerProvider.class);
- when(tcSrvOldProv.server(anyString(), any(ICredentialsProv.class)))
- .thenReturn(Mockito.mock(IAnalyticsEnabledTeamcity.class));
+ final IAnalyticsEnabledTeamcity tcOld = BuildChainProcessorTest.tcOldMock();
+ when(tcSrvOldProv.server(anyString(), any(ICredentialsProv.class))).thenReturn(tcOld);
+
bind(ITcServerProvider.class).toInstance(tcSrvOldProv);
@@ -82,12 +89,33 @@ public class PrChainsProcessorTest {
@Test
public void testTestFailureWithoutStatReportedAsBlocker() {
+ IStringCompactor c = injector.getInstance(IStringCompactor.class);
+ final String btId = "RunAll";
+ final String branch = "ignite-9542";
+
+ final Build build = new Build();
+ build.buildTypeId = btId;
+ build.setId(1000);
+ build.setStartDateTs(System.currentTimeMillis() - 100000);
+ build.setBranchName(branch);
+ build.status = BuildRef.STATUS_FAILURE;
+
+ final FatBuildCompacted fatBuildCompacted = new FatBuildCompacted(c, build);
+
+ TestOccurrenceFull tf = new TestOccurrenceFull();
+ tf.test = new TestRef();
+ tf.test.id = 1L;
+ tf.name = "testWithoutHistory";
+ tf.status = TestOccurrence.STATUS_FAILURE;
+
+ fatBuildCompacted.addTests(c, Collections.singletonList(tf));
+
+ apacheBuilds.put(fatBuildCompacted.id(), fatBuildCompacted);
- IStringCompactor c = injector.getInstance(IStringCompactor.class);
PrChainsProcessor prcp = injector.getInstance(PrChainsProcessor.class);
- final List<SuiteCurrentStatus> suitesStatuses = prcp.getSuitesStatuses("RunAll",
- "ignite-9542", SRV_ID, mock(ICredentialsProv.class));
+ final List<SuiteCurrentStatus> suitesStatuses = prcp.getSuitesStatuses(btId,
+ branch, SRV_ID, mock(ICredentialsProv.class));
assertNotNull(suitesStatuses);
assertFalse(suitesStatuses.isEmpty());
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedProviderMock.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedProviderMock.java
index 19ff931..298ea46 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedProviderMock.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedProviderMock.java
@@ -30,7 +30,7 @@ public class TeamcityIgnitedProviderMock implements ITeamcityIgnitedProvider {
Map<String,Map<Integer, FatBuildCompacted>> tcBuildsData = new ConcurrentHashMap<>();
public void addServer(String srvId, Map<Integer, FatBuildCompacted> apacheBuilds) {
- tcBuildsData.computeIfAbsent(srvId, k -> new ConcurrentHashMap<>()).putAll(apacheBuilds);
+ tcBuildsData.put(srvId, apacheBuilds);
}
@Override