Skip to content

Commit

Permalink
pytest >=7,<9
Browse files Browse the repository at this point in the history
  • Loading branch information
manics committed Jan 28, 2024
1 parent 6fe9ee6 commit 237375f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ build
conda-lock
pre-commit
pytest-cov
pytest>=4.6,<8
pytest>=7,<9
pyyaml
requests_mock
25 changes: 12 additions & 13 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
TESTS_DIR = os.path.abspath(os.path.dirname(__file__))


def pytest_collect_file(parent, path):
if path.basename == "verify":
return LocalRepo.from_parent(parent, path=path)
elif path.basename.endswith(".repos.yaml"):
return RemoteRepoList.from_parent(parent, path=path)
def pytest_collect_file(parent, file_path):
if file_path.name == "verify":
return LocalRepo.from_parent(parent, path=file_path)
elif file_path.name.endswith(".repos.yaml"):
return RemoteRepoList.from_parent(parent, path=file_path)


def make_test_func(args, skip_build=False, extra_run_kwargs=None):
Expand Down Expand Up @@ -233,24 +233,23 @@ def collect(self):
args = ["--appendix", 'RUN echo "appendix" > /tmp/appendix']
# If there's an extra-args.yaml file in a test dir, assume it contains
# a yaml list with extra arguments to be passed to repo2docker
extra_args_path = os.path.join(self.path.dirname, "test-extra-args.yaml")
if os.path.exists(extra_args_path):
with open(extra_args_path) as f:
extra_args = yaml.safe_load(f)
extra_args_path = self.path.parent / "test-extra-args.yaml"
if extra_args_path.exists():
extra_args = yaml.safe_load(extra_args_path.read_text())
args += extra_args

print(self.path.basename, self.path.dirname, str(self.path))
print(self.path.name, self.path.parent, str(self.path))
# re-use image name for multiple tests of the same image
# so we don't run through the build twice
rel_repo_dir = os.path.relpath(self.path.dirname, TESTS_DIR)
rel_repo_dir = os.path.relpath(self.path.parent, TESTS_DIR)
image_name = f"r2d-tests-{escapism.escape(rel_repo_dir, escape_char='-').lower()}-{int(time.time())}"
args.append(f"--image-name={image_name}")
args.append(self.path.dirname)
args.append(str(self.path.parent))
yield Repo2DockerTest.from_parent(self, name="build", args=args)

yield Repo2DockerTest.from_parent(
self,
name=self.path.basename,
name=self.path.name,
args=args + ["./verify"],
skip_build=True,
)
Expand Down

0 comments on commit 237375f

Please sign in to comment.