summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schubert <ben.c.schubert@gmail.com>2019-06-05 16:56:25 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-06-06 10:44:56 +0000
commit0e1b28fd6804bf323b5b552c7de237d6dd455d38 (patch)
tree4bc4ed4014e4664292730be00d6badc9d8f60a6d
parent0f61b96369172d63108038e4992505cddcb6d4bd (diff)
downloadbuildstream-0e1b28fd6804bf323b5b552c7de237d6dd455d38.tar.gz
test/integration: Fix 'wrong-import-order' pylint issues
-rw-r--r--tests/integration/artifact.py3
-rw-r--r--tests/integration/pullbuildtrees.py7
-rw-r--r--tests/integration/shellbuildtrees.py8
3 files changed, 11 insertions, 7 deletions
diff --git a/tests/integration/artifact.py b/tests/integration/artifact.py
index a01256550..27bf1a857 100644
--- a/tests/integration/artifact.py
+++ b/tests/integration/artifact.py
@@ -22,9 +22,10 @@
# pylint: disable=redefined-outer-name
import os
-import pytest
import shutil
+import pytest
+
from buildstream.testing import cli_integration as cli # pylint: disable=unused-import
from tests.testutils import create_artifact_share
from tests.testutils.site import HAVE_SANDBOX
diff --git a/tests/integration/pullbuildtrees.py b/tests/integration/pullbuildtrees.py
index f89be791f..c562149df 100644
--- a/tests/integration/pullbuildtrees.py
+++ b/tests/integration/pullbuildtrees.py
@@ -2,15 +2,16 @@
# pylint: disable=redefined-outer-name
import os
-import pytest
import shutil
-from tests.testutils import create_artifact_share
-from tests.testutils.site import HAVE_SANDBOX
+import pytest
from buildstream.testing import cli, cli_integration as cli2 # pylint: disable=unused-import
from buildstream._exceptions import ErrorDomain, LoadErrorReason
+from tests.testutils import create_artifact_share
+from tests.testutils.site import HAVE_SANDBOX
+
DATA_DIR = os.path.join(
os.path.dirname(os.path.realpath(__file__)),
diff --git a/tests/integration/shellbuildtrees.py b/tests/integration/shellbuildtrees.py
index bdce916ca..e371884e4 100644
--- a/tests/integration/shellbuildtrees.py
+++ b/tests/integration/shellbuildtrees.py
@@ -2,14 +2,16 @@
# pylint: disable=redefined-outer-name
import os
-import pytest
import shutil
-from tests.testutils import create_artifact_share
-from tests.testutils.site import HAVE_SANDBOX
+import pytest
+
from buildstream.testing import cli, cli_integration # pylint: disable=unused-import
from buildstream._exceptions import ErrorDomain
+from tests.testutils import create_artifact_share
+from tests.testutils.site import HAVE_SANDBOX
+
pytestmark = pytest.mark.integration