From ecdcf9e53a727a865d91650fae44da0a0bc82b9e Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Thu, 21 Dec 2023 16:31:56 +0100 Subject: [PATCH] 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. --- tests/conda/py311-extra-ignore-file-merge/test-extra-args.yaml | 2 +- tests/conda/py311-extra-ignore-file-ours/test-extra-args.yaml | 2 +- .../test-extra-args.yaml | 2 +- tests/conda/py311-extra-ignore-file-theirs/test-extra-args.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/conda/py311-extra-ignore-file-merge/test-extra-args.yaml b/tests/conda/py311-extra-ignore-file-merge/test-extra-args.yaml index 5e69a801..21698f18 100644 --- a/tests/conda/py311-extra-ignore-file-merge/test-extra-args.yaml +++ b/tests/conda/py311-extra-ignore-file-merge/test-extra-args.yaml @@ -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 diff --git a/tests/conda/py311-extra-ignore-file-ours/test-extra-args.yaml b/tests/conda/py311-extra-ignore-file-ours/test-extra-args.yaml index b89a2d30..c7de18c8 100644 --- a/tests/conda/py311-extra-ignore-file-ours/test-extra-args.yaml +++ b/tests/conda/py311-extra-ignore-file-ours/test-extra-args.yaml @@ -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 diff --git a/tests/conda/py311-extra-ignore-file-theirs-without-file/test-extra-args.yaml b/tests/conda/py311-extra-ignore-file-theirs-without-file/test-extra-args.yaml index a8c00a6b..86b75d33 100644 --- a/tests/conda/py311-extra-ignore-file-theirs-without-file/test-extra-args.yaml +++ b/tests/conda/py311-extra-ignore-file-theirs-without-file/test-extra-args.yaml @@ -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 diff --git a/tests/conda/py311-extra-ignore-file-theirs/test-extra-args.yaml b/tests/conda/py311-extra-ignore-file-theirs/test-extra-args.yaml index a8c00a6b..86b75d33 100644 --- a/tests/conda/py311-extra-ignore-file-theirs/test-extra-args.yaml +++ b/tests/conda/py311-extra-ignore-file-theirs/test-extra-args.yaml @@ -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