summaryrefslogtreecommitdiff
path: root/conftest.py
diff options
context:
space:
mode:
Diffstat (limited to 'conftest.py')
-rwxr-xr-xconftest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/conftest.py b/conftest.py
index ffe8fb3ae..e4eb1f5a8 100755
--- a/conftest.py
+++ b/conftest.py
@@ -19,10 +19,11 @@
# Tristan Maat <tristan.maat@codethink.co.uk>
import os
-import pytest
import shutil
import tempfile
+import pytest
+
def pytest_addoption(parser):
parser.addoption('--integration', action='store_true', default=False,