-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Rename _schedule.conf on YAML parse error #58179
Rename _schedule.conf on YAML parse error #58179
Conversation
@markuskramerIgitt Personally I don't like the idea to remove any data that is possibly edited by user. Maybe it's better to just skip and keep it? |
…e_schedule_conf_on_yaml_parse_error
…thub.com/markuskramerIgitt/salt into delete_schedule_conf_on_yaml_parse_error
@DmitryKuzmenko you are right, I took over your suggestion. @twangboy thank you for the test code! |
@markuskramerIgitt could you please resolve lint and pre-commit issues? Also your test code should be added to |
@DmitryKuzmenko where shall I add the test? Is this related to the error from unit.test_module_names.BadTestModuleNamesTestCase.test_module_name_source_match
How do I run the test locally? |
@markuskramerIgitt you shall move your test code from your new file |
@markuskramerIgitt sorry, I've missed the question about running tests.
To run pre-commit hooks you can use this command:
Surely you need to install the related dependencies like |
…e_schedule_conf_on_yaml_parse_error
@dwoz All checks have passed. Could you please remove the has-failing-test label? |
@sagetherage you removed "merge-ready": ci/py3/freebsd121 fails with "Caused: hudson.plugins.git.GitException: Could not checkout 4d7f55c" I assume this is unrelated to this PR, please support. Also, a number of unrelated ("boto") files are in the PR - I assume because I used a git checkout --theirs FILE-WITH-MERGE-CONFLICT does it help if I create a new PR? |
@markuskramerIgitt please don't care about it. The Merge-ready tag is just dropped from labels because we've found it useless. We don't use it to decide merge a PR or not. The decision is based on CI checks, code review and having tests covering the change. |
This PR's commits are a big mess. It's also caused bugs completely unrelated to _schedule.conf |
@OrangeDog I agree that my commits to this PR are confusing Next occasion I will scratch a PR branch with more than one commit and open a new one with a single commit. The reason for renaming a broken |
No, don't do that either. Rebase and/or amend so all the fixes go in the correct commits and force push. Don't use the same message for multiple commits. |
@OrangeDog, In August I made a Rebase and resolved conflicts by The boto files where introduced into this PR by this rebase. So far still no problem: "unrelated files" are regular part of a rebased PR. Where I think the problem arises, is that "unrelated files" should or even must not be changed. Is that correct? |
@markuskramerIgitt If those changes were on master then they wouldn't show up in this PR. You must have done something else, either pulling them from another branch, or reverting fixes that had already been merged. That is separate from the fact that your own changes include 16 identically-named commits. The blame does not all fall on you. The reviewers should also have noticed and nobody should have merged this. |
What issues does this PR fix?
Merge requirements satisfied?