Skip to content

Commit

Permalink
Merge pull request #605 from maresb/cleanup-gdal-test
Browse files Browse the repository at this point in the history
Clean up gdal tests
  • Loading branch information
mariusvniekerk committed Feb 23, 2024
2 parents 93135c1 + 18443cc commit 38ec395
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 262 deletions.
12 changes: 12 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
import re
import typing

from pathlib import Path
from typing import Any, Iterable, NamedTuple, NoReturn

import docker
import filelock
import pytest
import requests

Expand All @@ -16,6 +18,9 @@
from conda_lock.invoke_conda import PathLike, _ensureconda


TESTS_DIR = Path(__file__).parent


@pytest.fixture(
scope="session",
params=[
Expand Down Expand Up @@ -167,3 +172,10 @@ def test_quetz(quetz_server: QuetzServerInfo) -> None:
assert (
channel["mirror_channel_url"] == "https://conda-static.anaconda.org/conda-forge"
)


@pytest.fixture()
def install_lock():
"""Limit concurrent install operations."""
with filelock.FileLock(str(TESTS_DIR.joinpath("install.lock"))):
yield
89 changes: 0 additions & 89 deletions tests/gdal/conda-linux-64.lock

This file was deleted.

71 changes: 0 additions & 71 deletions tests/gdal/conda-osx-64.lock

This file was deleted.

Loading

0 comments on commit 38ec395

Please sign in to comment.