Unit test for no resources in the target folder #1478

BoykoAlex · 2023-07-18T17:28:24Z

In support of issue #1302

laeubi

Thanks for the testcase I'll hopefully find some time the next days to further analyses this failure, in the meantime I think the test can even be shrinked a bit see above comments.

org.eclipse.m2e.core.tests/resources/projects/demo/.gitignore

org.eclipse.m2e.core.tests/resources/projects/demo/mvnw

org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/AppPropsNotCopiedIntoTargetTest.java

BoykoAlex · 2023-07-18T21:51:01Z

Thanks @laeubi! I have pushed adjustments you've proposed.

github-actions · 2023-07-18T23:59:04Z

Test Results

216 files +109 216 suites +109 16m 17s ⏱️ + 6m 6s
666 tests + 1 654 ✅ - 1 10 💤 ± 0 1 ❌ +1 1 🔥 +1
1 332 runs +667 1 307 ✅ +653 22 💤 +11 2 ❌ +2 1 🔥 +1

For more details on these failures and errors, see this check.

Results for commit ab134c1. ± Comparison against base commit 8789e4c.

♻️ This comment has been updated with latest results.

laeubi · 2023-07-19T04:32:54Z

org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/AppPropsNotCopiedIntoTargetTest.java

+		pomXml.setContents(new ByteArrayInputStream("Nothing".getBytes()), true, false, null);
+
+		waitForJobsToComplete(monitor);
+		Thread.sleep(5000);


@HannesWell can you please advice here? It seems waitForJobsToComplete is not enough here or @BoykoAlex maybe can explain why additional wait is required here...

Basically waitForJobsToComplete wasn't enough. Removing Thread.sleep(...) calls makes it fail at line 76 AFAIR. There are ways to execute stuff async bypassing the Eclipse job queue, i.e. Display.asyncExec(...) or less likely CompletableFuture... I admit I didn't experiment any further with "waiting".

@BoykoAlex can you probably replace this then with a loop that check if the file is deleted and if not waits a little time up to 5 seconds?

martinlippert · 2023-08-01T07:20:39Z

Any news on this? Anything we can do to provide additional help?

laeubi · 2023-08-01T07:23:25Z

Any news on this? Anything we can do to provide additional help?

I have a rough idea how to solve this but not yet finished/implemented that,

martinlippert · 2023-08-01T07:25:28Z

Any news on this? Anything we can do to provide additional help?

I have a rough idea how to solve this but not yet finished/implemented that,

Sounds great. Let us know if we can provide any additional help here.

martinlippert · 2023-08-01T07:26:03Z

And many many many thanks for looking into this, very much appreciated !!!!!!!

laeubi · 2023-08-01T12:11:51Z

Anything we can do to provide additional help?

One possibility is of course to help with the upstream issue:

[MSHARED-1285] use an up-to-date scanner instead the newscanner apache/maven-filtering#77

this would already help for the case of copy resources.

laeubi · 2023-08-02T05:52:46Z

@BoykoAlex this looks good now, can you shash / rebase the testcase?

BoykoAlex · 2023-08-02T22:10:38Z

I have squashed and rebased the commits

laeubi · 2023-08-03T05:39:03Z

I have squashed and rebased the commits

Thanks, sadly even with my recent changes it still fails :-\

laeubi

It would be good to have some message added to the asserts so we don't need to check linenumbers in case of failure to see whats going on.

org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/AppPropsNotCopiedIntoTargetTest.java

BoykoAlex · 2023-08-03T14:05:34Z

Added the failure messages in asserts. Squashed the commits into a single commit again.

mickaelistria · 2023-10-30T13:05:47Z

@laeubi any idea why CI is requesting a version bump for an untouched bundle?

laeubi · 2023-10-30T13:06:41Z

This sometimes happens because of changed ECJ version.

mickaelistria · 2023-10-30T13:08:56Z

Indeed: https://ci.eclipse.org/m2e/job/m2e/job/master/ ; looks like build has been broken for 4 weeks already.

fbricon · 2023-10-30T13:11:03Z

It's because the license content changed

[INFO] Artifact comparison detailed log directory /Users/fbricon/Dev/projects/m2e-core/org.eclipse.m2e.logback/target/artifactcomparison
[WARNING] MavenProject: org.eclipse.m2e:org.eclipse.m2e.logback:2.2.0-SNAPSHOT @ /Users/fbricon/Dev/projects/m2e-core/org.eclipse.m2e.logback/.tycho-consumer-pom.xml: baseline and build artifacts have same version but different contents
   no-classifier: different
      META-INF/MANIFEST.MF: different
         Bundle-License: baseline='Eclipse Public License - v 2.0;link="https://www.eclipse.org/legal/epl-v20.html"' != reactor='EPL-2.0;link="https://www.eclipse.org/legal/epl-v20.html"'

[INFO] MavenProject: org.eclipse.m2e:org.eclipse.m2e.logback:2.2.0-SNAPSHOT @ /Users/fbricon/Dev/projects/m2e-core/org.eclipse.m2e.logback/.tycho-consumer-pom.xml
    The main artifact has been replaced with the baseline version.

adding <ignore>Bundle-License</ignore> to the baseline-check fixes it

mickaelistria · 2023-10-30T13:15:18Z

Ignoring MANIFEST fields in the comparison is IMO a last resort solution.
If the new Bundle-Header is more standard, we can also adopt it and just bump the version. Or we can probably change the license in the pom.xml so it says the same as before.

laeubi · 2023-12-27T06:31:46Z

org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/AppPropsNotCopiedIntoTargetTest.java

+
+		pomXml.setContents(new ByteArrayInputStream(content.getBytes()), true, false, null);
+		waitForJobsToComplete(monitor);
+		Thread.sleep(5000);


same here replace with a loop that checks regualry with an upper bound instead of a fixed delay.

BoykoAlex mentioned this pull request Jul 18, 2023

m2e plugin does not copy resources from src/main/resources, probably regression in 2022-12 #1302

Closed

laeubi reviewed Jul 18, 2023

View reviewed changes

HannesWell force-pushed the no-resources branch from 061a168 to e5f807c Compare July 18, 2023 23:29

laeubi reviewed Jul 19, 2023

View reviewed changes

laeubi force-pushed the no-resources branch from e5f807c to 20d2ef9 Compare August 2, 2023 05:51

BoykoAlex force-pushed the no-resources branch from 20d2ef9 to 40c9204 Compare August 2, 2023 22:09

laeubi reviewed Aug 3, 2023

View reviewed changes

BoykoAlex force-pushed the no-resources branch from 40c9204 to 6e07832 Compare August 3, 2023 14:04

tarioch mentioned this pull request Aug 16, 2023

m2e plugin sometimes "loses" resources - using snapshot 2.1.201.20230809-1423 #1511

Closed

laeubi force-pushed the no-resources branch from 6e07832 to 1771957 Compare October 9, 2023 10:29

mickaelistria force-pushed the no-resources branch from 1771957 to 030cd07 Compare October 30, 2023 12:21

mickaelistria mentioned this pull request Oct 30, 2023

ignore insignificant licence change in baseline-check #1587

Closed

mickaelistria force-pushed the no-resources branch from 030cd07 to 5ef5814 Compare October 30, 2023 14:52

laeubi force-pushed the no-resources branch from 5ef5814 to 8e84ca8 Compare December 26, 2023 12:24

laeubi reviewed Dec 27, 2023

View reviewed changes

HannesWell force-pushed the no-resources branch from 8e84ca8 to d5d4001 Compare January 27, 2024 09:08

HannesWell force-pushed the no-resources branch from d5d4001 to ecec91f Compare February 4, 2024 16:30

HannesWell force-pushed the no-resources branch from ecec91f to bf4644c Compare February 17, 2024 21:52

Unit test for no resources in the target folder

ab134c1

HannesWell force-pushed the no-resources branch from bf4644c to ab134c1 Compare February 21, 2024 22:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unit test for no resources in the target folder #1478

Unit test for no resources in the target folder #1478

BoykoAlex commented Jul 18, 2023

laeubi left a comment

BoykoAlex commented Jul 18, 2023

github-actions bot commented Jul 18, 2023 •

edited

laeubi Jul 19, 2023

BoykoAlex Jul 19, 2023

laeubi Dec 27, 2023

martinlippert commented Aug 1, 2023

laeubi commented Aug 1, 2023

martinlippert commented Aug 1, 2023

martinlippert commented Aug 1, 2023

laeubi commented Aug 1, 2023

laeubi commented Aug 2, 2023

BoykoAlex commented Aug 2, 2023

laeubi commented Aug 3, 2023

laeubi left a comment

BoykoAlex commented Aug 3, 2023

mickaelistria commented Oct 30, 2023

laeubi commented Oct 30, 2023

mickaelistria commented Oct 30, 2023

fbricon commented Oct 30, 2023 •

edited

mickaelistria commented Oct 30, 2023

laeubi Dec 27, 2023

Unit test for no resources in the target folder #1478

Are you sure you want to change the base?

Unit test for no resources in the target folder #1478

Conversation

BoykoAlex commented Jul 18, 2023

laeubi left a comment

Choose a reason for hiding this comment

BoykoAlex commented Jul 18, 2023

github-actions bot commented Jul 18, 2023 • edited

Test Results

laeubi Jul 19, 2023

Choose a reason for hiding this comment

BoykoAlex Jul 19, 2023

Choose a reason for hiding this comment

laeubi Dec 27, 2023

Choose a reason for hiding this comment

martinlippert commented Aug 1, 2023

laeubi commented Aug 1, 2023

martinlippert commented Aug 1, 2023

martinlippert commented Aug 1, 2023

laeubi commented Aug 1, 2023

laeubi commented Aug 2, 2023

BoykoAlex commented Aug 2, 2023

laeubi commented Aug 3, 2023

laeubi left a comment

Choose a reason for hiding this comment

BoykoAlex commented Aug 3, 2023

mickaelistria commented Oct 30, 2023

laeubi commented Oct 30, 2023

mickaelistria commented Oct 30, 2023

fbricon commented Oct 30, 2023 • edited

mickaelistria commented Oct 30, 2023

laeubi Dec 27, 2023

Choose a reason for hiding this comment

github-actions bot commented Jul 18, 2023 •

edited

fbricon commented Oct 30, 2023 •

edited