diff --git a/tests/conftest.py b/tests/conftest.py index 87cccb8b..333d0b24 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -35,9 +35,9 @@ def pytest_collect_file(parent, path): if path.basename == "verify": - return LocalRepo.from_parent(parent, fspath=path) + return LocalRepo.from_parent(parent, path=path) elif path.basename.endswith(".repos.yaml"): - return RemoteRepoList.from_parent(parent, fspath=path) + return RemoteRepoList.from_parent(parent, path=path) def make_test_func(args, skip_build=False, extra_run_kwargs=None): @@ -213,7 +213,7 @@ def __init__( super().__init__(name, parent, callobj=f) def reportinfo(self): - return (self.parent.fspath, None, "") + return (self.parent.path, None, "") def repr_failure(self, excinfo): err = excinfo.value @@ -233,24 +233,24 @@ 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.fspath.dirname, "test-extra-args.yaml") + 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) args += extra_args - print(self.fspath.basename, self.fspath.dirname, str(self.fspath)) + print(self.path.basename, self.path.dirname, 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.fspath.dirname, TESTS_DIR) + rel_repo_dir = os.path.relpath(self.path.dirname, 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.fspath.dirname) + args.append(self.path.dirname) yield Repo2DockerTest.from_parent(self, name="build", args=args) yield Repo2DockerTest.from_parent( self, - name=self.fspath.basename, + name=self.path.basename, args=args + ["./verify"], skip_build=True, ) @@ -273,7 +273,7 @@ def collect(self): class RemoteRepoList(pytest.File): def collect(self): - with self.fspath.open() as f: + with self.path.open() as f: repos = yaml.safe_load(f) for repo in repos: args = []