Skip to content
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.

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

Remove Android test discovery workarounds #1747

Merged
merged 6 commits into from
Jan 29, 2023

Conversation

mhsmith
Copy link
Member

@mhsmith mhsmith commented Jan 19, 2023

They're no longer needed now that extractPackages is in the Android template.

Requires beeware/briefcase-android-gradle-template#60: DO NOT MERGE this PR before that one.

I've also added an extractPackages line for toga_android, which should allow #1707 to remove the code that disables coverage on Android.

PR Checklist:

  • All new features have been tested
  • All new features have been documented
  • I have read the CONTRIBUTING.md file
  • I will abide by the code of conduct

@mhsmith
Copy link
Member Author

mhsmith commented Jan 19, 2023

CI will have to be rerun once beeware/briefcase-android-gradle-template#60 is merged.

Copy link
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I initially had some difficulty getting this working on Py3.10 (log file); but after stepping away and coming back to it, I can't reproduce that failure. I'm guessing I had something stale in my environment, but I can't work out what.

Otherwise - seems to work well.

@freakboy3742
Copy link
Member

I've merged up the macOS-probe changes, which also means we now have a coverage report on Android. There is a workaround required because of nedbat/coveragepy#1542.

@mhsmith
Copy link
Member Author

mhsmith commented Jan 25, 2023

I initially had some difficulty getting this working on Py3.10 (log file); but after stepping away and coming back to it, I can't reproduce that failure. I'm guessing I had something stale in my environment, but I can't work out what.

OK, I've reproduced this now: see chaquo/chaquopy#777.

@mhsmith mhsmith marked this pull request as ready for review January 28, 2023 10:51
@mhsmith
Copy link
Member Author

mhsmith commented Jan 28, 2023

I've fixed an issue with the coverage workaround which was crashing the test thread on desktop platforms, and added a top-level exception handler so the app will exit in such cases rather than hanging forever.

Copy link
Member

@freakboy3742 freakboy3742 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those changes all make sense to me; 👍

@freakboy3742 freakboy3742 merged commit 978885b into beeware:main Jan 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants