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 collect_upstream_conda_tests and test_modified_upstream #371

Merged
merged 4 commits into from
Nov 11, 2023

Conversation

jaimergp
Copy link
Contributor

@jaimergp jaimergp commented Nov 10, 2023

Description

Now that conda/conda@main has merged 23.10 back in, we can rely directly on conda's unaltered test suite. To be decided if we want to keep doing this, but for now let's just use it as is.

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Nov 10, 2023
@jaimergp
Copy link
Contributor Author

_______________________ test_install_features[libmamba] ________________________
[XPASS(strict)] Features not supported in libmamba

Did we accidentally fix something in main? 😱 Noice if true! This one was passing (i.e. failing as expected) in conda/conda 🤔

@jaimergp
Copy link
Contributor Author

Yep, I bisected through the recent history and that test started passing with 671b9c1 being merged. I'll remove the strict=True upstream.

@jaimergp
Copy link
Contributor Author

jaimergp commented Nov 11, 2023

Submitted conda/conda#13320 upstream. I'll merge if the reruns are successful. The test_install_feature will still xpass til that PR is merged.

@jaimergp jaimergp marked this pull request as ready for review November 11, 2023 13:56
@jaimergp
Copy link
Contributor Author

tests/test_misc.py::test_explicit_missing_cache_entries fails on macOS because I assume the test order makes it have a PackageCache with an entry whose url is None. I added a patch in the same PR and will merge this one to unlock #365.

@jaimergp jaimergp merged commit b864e27 into main Nov 11, 2023
62 of 71 checks passed
@jaimergp jaimergp deleted the remove-upstream-patches branch November 11, 2023 16:17
@jaimergp jaimergp mentioned this pull request Nov 13, 2023
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Nov 11, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants