Fix: gitdist: dist-repo-status: Display tag or SHA1 instead of 'HEAD' #590
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These were exposed with Python 3.6.8. These changes make all of the warnings go away for the gitdist unit tests.
This makes the tests a little more maintainable.
I broke the system-level functioning of detailed head info when I refactored and then squashed the commit: gitdist: dist-repo-status: Display tag or SHA1 instead of 'HEAD' to change how 'showMoreHeadDetails' is passed in to get the CheckinTest.py tests to pass. I did not go back and ensure that the 'gitdist' script was behaving as it should. I was missing a system-level test to ensure the correct behavior. The fix is one-line (which I will add in the next commit) but it took over 100 lines of test code (in this commit) to test this change. That is terrible. The tests need to be more maintainable. I added a todo in the unit tests file to refactor the testing code to reduce duplication and make the tests more maintainable. The way the testing is done now is technical debt and is starting to look like the CheckinTest.py tests (which is why it is so hard to modify that code). I really should have done that refactroing here but it should be done before any other major work on this code.
I broke the system-level functioning of the detached head state details when I refactored and then squashed the commit: gitdist: dist-repo-status: Display tag or SHA1 instead of 'HEAD' to change how 'showMoreHeadDetails' is passed in to get the CheckinTest.py tests to pass. I did not go back and ensure that the 'gitdist' script was behaving as it should. I was missing a system-level test to ensure the correct behavior. This fix makes the failing test added in the previous commit pass.
This also updated the tests.
rabartlett1972
approved these changes
Jun 30, 2023
bartlettroscoe
added a commit
to bartlettroscoe/Trilinos
that referenced
this pull request
Jul 7, 2023
…ribits-update This pulls in the new TriBITS PRs: * TriBITSPub/TriBITS#583 * TriBITSPub/TriBITS#585 * TriBITSPub/TriBITS#586 * TriBITSPub/TriBITS#587 * TriBITSPub/TriBITS#588 * TriBITSPub/TriBITS#590
bartlettroscoe
added a commit
to bartlettroscoe/Trilinos
that referenced
this pull request
Sep 23, 2023
…bits This brings in the following TriBITS PRs: * TriBITSPub/TriBITS#591: Allow 100% raw CMake to be used in a TriBITS-compliant package (TriBITSPub/TriBITS#582) * TriBITSPub/TriBITS#588: gitdist: Pass in '-c color.status=always' when --dist-no-color is not added * TriBITSPub/TriBITS#590: Fix: gitdist: dist-repo-status: Display tag or SHA1 instead of 'HEAD' * TriBITSPub/TriBITS#587: gitdist: dist-repo-status: Display tag or SHA1 instead of 'HEAD' * TriBITSPub/TriBITS#586: More cleanup of packaging support (trilinos#11976) This goes back to TriBITS commits from June 2023.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a bug is the previous PR #587. See commit messages for details.
This replaces the following PR that seems to show a GitHub defect described in #589 (comment):
I was afraid that the GitHub defect would cause the merge of the wrong commits.