-
Notifications
You must be signed in to change notification settings - Fork 362
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: update path to test ignore file
This is a bit fragile as the path given here should be related to where pytest is called.
- Loading branch information
Showing
4 changed files
with
4 additions
and
4 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # This file is respected by repo2docker's test suite, but not repo2docker | ||
| # itself. It is used solely to help us test repo2docker's command line flags. | ||
| # | ||
| - --extra-ignore-file=ignore-file | ||
| - --extra-ignore-file=tests/conda/ignore-file | ||
| - --ignore-file-strategy=merge |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # This file is respected by repo2docker's test suite, but not repo2docker | ||
| # itself. It is used solely to help us test repo2docker's command line flags. | ||
| # | ||
| - --extra-ignore-file=ignore-file | ||
| - --extra-ignore-file=tests/conda/ignore-file | ||
| - --ignore-file-strategy=ours |
2 changes: 1 addition & 1 deletion
2
tests/conda/py311-extra-ignore-file-theirs-without-file/test-extra-args.yaml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # This file is respected by repo2docker's test suite, but not repo2docker | ||
| # itself. It is used solely to help us test repo2docker's command line flags. | ||
| # | ||
| - --extra-ignore-file=ignore-file | ||
| - --extra-ignore-file=tests/conda/ignore-file | ||
| - --ignore-file-strategy=theirs |
2 changes: 1 addition & 1 deletion
2
tests/conda/py311-extra-ignore-file-theirs/test-extra-args.yaml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # This file is respected by repo2docker's test suite, but not repo2docker | ||
| # itself. It is used solely to help us test repo2docker's command line flags. | ||
| # | ||
| - --extra-ignore-file=ignore-file | ||
| - --extra-ignore-file=tests/conda/ignore-file | ||
| - --ignore-file-strategy=theirs |