From 541104fadfc28745f55d90939ac0c813ebdcc935 Mon Sep 17 00:00:00 2001
From: Sean Gillies <sean@mapbox.com>
Date: Thu, 21 Apr 2016 16:39:15 -0600
Subject: [PATCH] Make test cleanup less sensitive to skipped tests

---
 tests/conftest.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 84c18a65..cdc17703 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -245,6 +245,7 @@ def gdalenv(request):
     import rasterio.env
 
     def fin():
-        rasterio.env.delenv()
-        rasterio.env._env = None
+        if rasterio.env._env:
+            rasterio.env.delenv()
+            rasterio.env._env = None
     request.addfinalizer(fin)