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

Add --compare-file-text=soft #252

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

kpaulisse
Copy link
Contributor

@kpaulisse kpaulisse commented May 11, 2021

Overview

This pull request expands upon the "force" option added in #251. This forces the "compare file text" feature to be used, but does not raise an exception if it fails. Hence "soft".

This is useful when octocatalog-diff runs are being broken into individual components (e.g. leveraging bazel for caching). One process compiles the "to" catalog and another compiles the "from" catalog, and then a third step takes those two catalogs as input and does the "diff". To make the "compare file text" function work in this case, we have to force it on for the compilation of the "to" catalog (hence #251) and force it on, but not raise an exception for problems, for the compilation of the "from" catalog (this PR).

I updated the docs accordingly and added additional integration tests for these options, in addition to the unit tests at 💯 as per project requirements. In addition we have been using this for several months at my employer and it's been working as intended.

Checklist

  • Make sure that all of the tests pass, and fix any that don't. Just run rake in your checkout directory, or review the CI job triggered whenever you push to a pull request.
  • Make sure that there is 100% test coverage by running rake coverage:spec or ignoring untestable sections of code with # :nocov comments. If you need help getting to 100% coverage please ask; however, don't just submit code with no tests.
  • If you have added a new command line option, we would greatly appreciate a corresponding integration test that exercises it from start to finish. This is optional but recommended.

Copy link

@erkkkkkkkkk erkkkkkkkkk left a comment

Choose a reason for hiding this comment

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

Octa

@kpaulisse kpaulisse changed the title Add --compare-file-text=forcenoexc Add --compare-file-text=soft Aug 23, 2021
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

3 participants