Skip to content

Commit 50ec17d

Browse files
author
Artem Eroshenko
authored
matrix tests fixes (via #176)
1 parent 87968d0 commit 50ec17d

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ pipeline {
3232
}
3333
post {
3434
always {
35+
allure results: [[path: 'build/test-results/test']]
3536
deleteDir()
3637
}
3738
failure {

src/test/java/ru/yandex/qatools/allure/jenkins/ReportGenerateIT.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -141,30 +141,20 @@ public void shouldGenerateReportForGlob() throws Exception {
141141
@Test
142142
public void shouldGenerateReportForMatrixItem() throws Exception {
143143
MatrixProject project = jRule.createProject(MatrixProject.class);
144-
project.getAxes().add(new Axis("labels", "a", "b"));
144+
project.getAxes().add(new Axis("items", "first", "second"));
145145
project.setScm(getSimpleFileScm("sample-testsuite.xml", ALLURE_RESULTS));
146146
project.getPublishersList().add(createAllurePublisher("allure-results"));
147147

148148
MatrixBuild build = jRule.buildAndAssertSuccess(project);
149149

150+
assertThat(build.getActions(AllureReportBuildAction.class)).hasSize(1);
150151
assertThat(build.getRuns()).hasSize(2);
151152
for (MatrixRun run : build.getRuns()) {
152153
jRule.assertBuildStatus(Result.SUCCESS, run);
153154
assertThat(run.getActions(AllureReportBuildAction.class)).hasSize(1);
154155
}
155156
}
156157

157-
@Test
158-
public void shouldGenerateAggregatedReportForMatrixJobs() throws Exception {
159-
MatrixProject project = jRule.createProject(MatrixProject.class);
160-
project.getAxes().add(new Axis("labels", "first", "second", "third"));
161-
project.setScm(getSimpleFileScm("sample-testsuite.xml", ALLURE_RESULTS));
162-
project.getPublishersList().add(createAllurePublisher("allure-results"));
163-
164-
MatrixBuild build = jRule.buildAndAssertSuccess(project);
165-
assertThat(build.getActions(AllureReportBuildAction.class)).hasSize(1);
166-
}
167-
168158
@Test
169159
public void shouldGenerateReportOnSlave() throws Exception {
170160
FreeStyleProject project = jRule.createFreeStyleProject();

0 commit comments

Comments
 (0)