conditional import of test dependencies

This commit is contained in:
Krisztián Szűcs committed 2019-09-24 16:49:04 +02:00
1 parent efa05d28e7
commit 2cb19d1ff8
2 files changed
+12 -9

No files matched your search

+11 -8
View File
@@ -246,19 +246,22 @@ def minio_server():
minio_dir = os.environ.get('S3FS_DIR', '')
minio_bin = os.path.join(minio_dir, 'minio') if minio_dir else 'minio'
with tempfile.TemporaryDirectory() as tempdir:
args = [minio_bin, '--compat', 'server', '--quiet', '--address',
address, tempdir]
with subprocess.Popen(args, env=env) as proc:
yield address, access_key, secret_key
proc.terminate()
try:
with tempfile.TemporaryDirectory() as tempdir:
args = [minio_bin, '--compat', 'server', '--quiet', '--address',
address, tempdir]
with subprocess.Popen(args, env=env) as proc:
yield address, access_key, secret_key
proc.terminate()
except IOError:
pytest.skip('`minio` command cannot be located, try to set S3FS_DIR')
@pytest.fixture(scope='module')
def minio_client(minio_server):
from minio import Minio
minio = pytest.importorskip('minio')
address, access_key, secret_key = minio_server
return Minio(
return minio.Minio(
address,
access_key=access_key,
secret_key=secret_key,
+1 -1
View File
@@ -1845,7 +1845,7 @@ def test_filters_read_table(tempdir):
@pytest.fixture
def s3_example(minio_server, minio_bucket):
import s3fs
s3fs = pytest.importorskip('s3fs')
address, access_key, secret_key = minio_server
bucket_name = minio_bucket