fixture error handling

apache · Sep 24, 2019 · 00340ed · 00340ed
1 parent 2be25ce
commit 00340ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/python/pyarrow/fs.py b/python/pyarrow/fs.py
@@ -31,4 +31,4 @@
 except ImportError:
     pass
 else:
-    initialize_s3()
+    initialize_s3()
diff --git a/python/pyarrow/tests/conftest.py b/python/pyarrow/tests/conftest.py
@@ -261,17 +261,19 @@ def minio_server():
         'MINIO_SECRET_KEY': secret_key
     })
 
-    try:
-        with TemporaryDirectory() as tempdir:
-            args = ['minio', '--compat', 'server', '--quiet', '--address',
-                    address, tempdir]
-            try:
-                proc = subprocess.Popen(args, env=env)
-                yield address, access_key, secret_key
-            finally:
+    with TemporaryDirectory() as tempdir:
+        args = ['minio', '--compat', 'server', '--quiet', '--address',
+                address, tempdir]
+        proc = None
+        try:
+            proc = subprocess.Popen(args, env=env)
+        except IOError:
+            pytest.skip('`minio` command cannot be located')
+        else:
+            yield address, access_key, secret_key
+        finally:
+            if proc is not None:
                 proc.kill()
-    except IOError:
-        pytest.skip('`minio` command cannot be located')
 
 
 @pytest.fixture(scope='session')