Skip to content

Hack for io.jenkins.configuration-as-code:test-harness + JEP-229 fix #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
timja wants to merge 3 commits into from
Closed

Hack for io.jenkins.configuration-as-code:test-harness + JEP-229 fix #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1ebf56
Revert "Merge pull request #299 from imonteroperez/bugfix-surefire-ex…
timja Jan 31, 2022
ef1d7a2
Hack for io.jenkins.configuration-as-code:test-harness
jglick Mar 11, 2021
afc19b2
Disable failing test
timja Jan 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ itBranches['google-compute-engine:4.3.3 tests on retrieving the test report'] =
}


/*
TODO Fails as it tries to override with the jcasc test harness which doesn't exist on the core version targeted
need to update plugins and war version to fix this
itBranches['WAR with non-default groupId plugins - smoke test'] = {
node('docker') {
checkout scm
Expand Down Expand Up @@ -185,6 +188,7 @@ itBranches['WAR with non-default groupId plugins - smoke test'] = {
}
}
}
*/

//TODO (oleg-nenashev): This step is unstable at the moment, see JENKINS-60583
Map disabled_itBranches = [:]
Expand Down
21 changes: 12 additions & 9 deletions plugins-compat-tester/src/main/java/org/jenkins/tools/test/PluginCompatTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
Expand Down Expand Up @@ -311,26 +310,24 @@ && new VersionNumber(coreCoordinates.version).compareTo(new VersionNumber("1.485
if (errorMessage == null) {
try {
TestExecutionResult result = testPluginAgainst(actualCoreCoordinates, plugin, mconfig, pomData, pluginsToCheck, pluginGroupIds, pcth, config.getOverridenPlugins());
if (result.getTestDetails().isSuccess()) {
if (result.getTestDetails().getFailed().isEmpty()) {
status = TestStatus.SUCCESS;
} else {
status = TestStatus.TEST_FAILURES;
}
warningMessages.addAll(result.pomWarningMessages);
testDetails.addAll(config.isStoreAll() ? result.getTestDetails().getAll() : result.getTestDetails().hasFailures() ? result.getTestDetails().getFailed() : Collections.emptySet());
testDetails.addAll(config.isStoreAll() ? result.getTestDetails().getAll() : result.getTestDetails().getFailed());
} catch (PomExecutionException e) {
if(!e.succeededPluginArtifactIds.contains("maven-compiler-plugin")){
status = TestStatus.COMPILATION_ERROR;
} else if (!e.getTestDetails().hasBeenExecuted()) { // testing was not able to start properly (i.e: invalid exclusion list file format)
status = TestStatus.INTERNAL_ERROR;
} else if (e.getTestDetails().hasFailures()) {
status = TestStatus.TEST_FAILURES;
} else if (!e.getTestDetails().getFailed().isEmpty()) {
status = TestStatus.TEST_FAILURES;
} else { // Can this really happen ???
status = TestStatus.SUCCESS;
}
errorMessage = e.getErrorMessage();
warningMessages.addAll(e.getPomWarningMessages());
testDetails.addAll(config.isStoreAll() ? e.getTestDetails().getAll() : e.getTestDetails().hasFailures() ? e.getTestDetails().getFailed() : Collections.emptySet());
testDetails.addAll(config.isStoreAll() ? e.getTestDetails().getAll() : e.getTestDetails().getFailed());
} catch (Error e){
// Rethrow the error ... something is wrong !
throw e;
Expand Down Expand Up @@ -576,7 +573,7 @@ private TestExecutionResult testPluginAgainst(MavenCoordinates coreCoordinates,
} catch (PomExecutionException e){
e.getPomWarningMessages().addAll(pomData.getWarningMessages());
if (ranCompile) {
// So the status cannot be considered COMPILATION_ERROR
// So the status is considered to be TEST_FAILURES not COMPILATION_ERROR:
e.succeededPluginArtifactIds.add("maven-compiler-plugin");
}
throw e;
Expand Down Expand Up @@ -1063,6 +1060,12 @@ private void addSplitPluginDependencies(String thisPlugin, MavenRunner.Config mc
toAddTest = difference(pluginDeps, toAddTest);
toAddTest = difference(toAdd, toAddTest);

if (toReplaceTest.containsKey("configuration-as-code")) {
VersionNumber versionNumber = toReplaceTest.get("configuration-as-code");
pluginGroupIds.put("test-harness", "io.jenkins.configuration-as-code");
toReplaceTest.put("test-harness", versionNumber);
}

if (!toAdd.isEmpty() || !toReplace.isEmpty() || !toAddTest.isEmpty() || !toReplaceTest.isEmpty()) {
System.out.println("Adding/replacing plugin dependencies for compatibility: " + toAdd + " " + toReplace + "\nFor test: " + toAddTest + " " + toReplaceTest);
pom.addDependencies(toAdd, toReplace, toAddTest, toReplaceTest, pluginGroupIds, convertFromTestDep);
Expand Down
29 changes: 7 additions & 22 deletions ...ins-compat-tester/src/main/java/org/jenkins/tools/test/util/ExecutedTestNamesDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public class ExecutedTestNamesDetails {

public ExecutedTestNamesDetails() {
this.tests = new HashMap<>();
this.tests.put(FAILED, new TreeSet<String>());
this.tests.put(EXECUTED, new TreeSet<String>());
}

public void addFailedTest(String test) {
Expand All @@ -27,13 +29,8 @@ public void addExecutedTest(String test) {
}

public Set<String> getAll() {
Set<String> result = new TreeSet<>();
if (this.tests.containsKey(EXECUTED)) {
result.addAll(this.tests.get(EXECUTED));
}
if (this.tests.containsKey(FAILED)) {
result.addAll(this.tests.get(FAILED));
}
Set<String> result = new TreeSet<>(this.tests.get(EXECUTED));
result.addAll(this.tests.get(FAILED));
return Collections.unmodifiableSet(result);
}

Expand All @@ -46,25 +43,13 @@ public Set<String> getExecuted() {
}

private Set<String> get(String key) {
return this.tests.containsKey(key) ? Collections.unmodifiableSet(new TreeSet<>(this.tests.get(key))) : null;
return Collections.unmodifiableSet(new TreeSet<>(this.tests.get(key)));
}

private void add(String key, String test) {
if (this.tests.get(key) == null) {
this.tests.put(key, new TreeSet<String>());
}
this.tests.get(key).add(test);
}



public boolean hasBeenExecuted() {
return getExecuted() != null || getFailed() != null;
}

public boolean isSuccess() {
return getExecuted() != null && getFailed() == null;
}

public boolean hasFailures() {
return getFailed() != null && !getFailed().isEmpty();
}
}
22 changes: 10 additions & 12 deletions plugins-compat-tester/src/main/java/org/jenkins/tools/test/util/ExecutedTestNamesSolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,18 @@ public ExecutedTestNamesDetails solve(Set<String> types, Set<String> executedTes

System.out.println("[INFO] ");
System.out.println("[INFO] Results:");
printDetails(testNames.getExecuted(), "Executed");
printDetails(testNames.getFailed(), "Failed");
return testNames;
}

private void printDetails(Set<String> tests, String type) {
System.out.println("[INFO] ");
int size = tests != null ? tests.size() : 0;
System.out.println(String.format("[INFO] %s: %s", type, size));
if (size != 0) {
for (String testName : tests) {
System.out.println(String.format("[INFO] - %s", testName));
}
System.out.println(String.format("[INFO] Executed: %s", testNames.getExecuted().size()));
for (String testName : testNames.getExecuted()) {
System.out.println(String.format("[INFO] - %s", testName));
}
System.out.println("[INFO] ");
System.out.println(String.format("[INFO] Failed: %s", testNames.getFailed().size()));
for (String testName : testNames.getFailed()) {
System.out.println(String.format("[INFO] - %s", testName));
}

return testNames;
}

private List<String> getReportsDirectoryPaths(Set<String> types, File baseDirectory) throws ExecutedTestNamesSolverException {
Expand Down
24 changes: 0 additions & 24 deletions plugins-compat-tester/src/test/java/org/jenkins/tools/test/PluginCompatTesterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,30 +215,6 @@ public void testWithCasCProperties() throws Throwable {
PluginCompatTester tester = new PluginCompatTester(config);
tester.testPlugins();
}

@Test
public void testWithInvalidExclusionList() throws Throwable {
File exclusionList = new ClassPathResource("bad-surefire-exclusion-list").getFile();
PluginCompatTesterConfig config = getConfig(ImmutableList.of("active-directory"));
Map<String, String> mavenProperties = new HashMap<>();
mavenProperties.put("surefire.excludesFile", exclusionList.getAbsolutePath());
config.setMavenProperties(mavenProperties);

PluginCompatTester tester = new PluginCompatTester(config);
PluginCompatReport report = tester.testPlugins();
assertNotNull(report);
Map<PluginInfos, List<PluginCompatResult>> pluginCompatTests = report.getPluginCompatTests();
assertNotNull(pluginCompatTests);
for (Entry<PluginInfos, List<PluginCompatResult>> entry : pluginCompatTests.entrySet()) {
assertEquals("active-directory", entry.getKey().pluginName);
List<PluginCompatResult> results = entry.getValue();
assertEquals(1, results.size());
PluginCompatResult result = results.get(0);
assertNotNull(result);
assertNotNull(result.status);
assertEquals(TestStatus.INTERNAL_ERROR, result.status);
}
}

private PluginCompatTesterConfig getConfig(List<String> includedPlugins) throws IOException {
PluginCompatTesterConfig config = new PluginCompatTesterConfig(testFolder.getRoot(),
Expand Down
1 change: 0 additions & 1 deletion plugins-compat-tester/src/test/resources/bad-surefire-exclusion-list
View file
Open in desktop

This file was deleted.