summaryrefslogtreecommitdiff
path: root/tests/format
diff options
context:
space:
mode:
Diffstat (limited to 'tests/format')
-rw-r--r--tests/format/assertion.py2
-rw-r--r--tests/format/dependencies.py1
-rw-r--r--tests/format/include.py4
-rw-r--r--tests/format/include_composition.py5
-rw-r--r--tests/format/invalid_keys.py2
-rw-r--r--tests/format/junctions.py1
-rw-r--r--tests/format/link.py3
-rw-r--r--tests/format/listdirectiveerrors.py2
-rw-r--r--tests/format/option-list-directive.py2
-rw-r--r--tests/format/optionbool.py2
-rw-r--r--tests/format/optioneltmask.py2
-rw-r--r--tests/format/optionenum.py2
-rw-r--r--tests/format/optionexports.py2
-rw-r--r--tests/format/optionflags.py2
-rw-r--r--tests/format/optionoverrides.py2
-rw-r--r--tests/format/options.py2
-rw-r--r--tests/format/project.py3
-rw-r--r--tests/format/projectoverrides.py2
-rw-r--r--tests/format/substitutions.py3
-rw-r--r--tests/format/variables.py1
20 files changed, 35 insertions, 10 deletions
diff --git a/tests/format/assertion.py b/tests/format/assertion.py
index 3ca50726c..44330b883 100644
--- a/tests/format/assertion.py
+++ b/tests/format/assertion.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/dependencies.py b/tests/format/dependencies.py
index b1a684081..ada120b2a 100644
--- a/tests/format/dependencies.py
+++ b/tests/format/dependencies.py
@@ -2,6 +2,7 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
from buildstream.exceptions import ErrorDomain, LoadErrorReason
diff --git a/tests/format/include.py b/tests/format/include.py
index d57dd8c19..f78ee8376 100644
--- a/tests/format/include.py
+++ b/tests/format/include.py
@@ -3,13 +3,15 @@
import os
import textwrap
+
import pytest
+
from buildstream import _yaml
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing import cli # pylint: disable=unused-import
from buildstream.testing import create_repo
-from tests.testutils import generate_junction
+from tests.testutils import generate_junction
# Project directory
DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "include")
diff --git a/tests/format/include_composition.py b/tests/format/include_composition.py
index 3224822af..d87d80735 100644
--- a/tests/format/include_composition.py
+++ b/tests/format/include_composition.py
@@ -1,10 +1,9 @@
import os
-
from contextlib import contextmanager
-from buildstream._project import Project
-from buildstream._includes import Includes
from buildstream import _yaml
+from buildstream._includes import Includes
+from buildstream._project import Project
from tests.testutils import dummy_context
diff --git a/tests/format/invalid_keys.py b/tests/format/invalid_keys.py
index b2bab194e..cc12c08e3 100644
--- a/tests/format/invalid_keys.py
+++ b/tests/format/invalid_keys.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/junctions.py b/tests/format/junctions.py
index f5858f7e2..099c7aab7 100644
--- a/tests/format/junctions.py
+++ b/tests/format/junctions.py
@@ -10,7 +10,6 @@ from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing import cli # pylint: disable=unused-import
from buildstream.testing import create_repo
-
DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "junctions",)
diff --git a/tests/format/link.py b/tests/format/link.py
index e2c9e0b84..2be5861d6 100644
--- a/tests/format/link.py
+++ b/tests/format/link.py
@@ -5,9 +5,8 @@ import os
import pytest
-from buildstream.testing import cli # pylint: disable=unused-import
from buildstream.exceptions import ErrorDomain, LoadErrorReason
-
+from buildstream.testing import cli # pylint: disable=unused-import
DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "link",)
diff --git a/tests/format/listdirectiveerrors.py b/tests/format/listdirectiveerrors.py
index 77d9b3f55..9e4fdae88 100644
--- a/tests/format/listdirectiveerrors.py
+++ b/tests/format/listdirectiveerrors.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/option-list-directive.py b/tests/format/option-list-directive.py
index 2df5b6f77..313741af0 100644
--- a/tests/format/option-list-directive.py
+++ b/tests/format/option-list-directive.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream.testing.runcli import cli # pylint: disable=unused-import
# Project directory
diff --git a/tests/format/optionbool.py b/tests/format/optionbool.py
index 6f5624926..75e2ebd5c 100644
--- a/tests/format/optionbool.py
+++ b/tests/format/optionbool.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream import _yaml
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/optioneltmask.py b/tests/format/optioneltmask.py
index c5b32d127..52deebe67 100644
--- a/tests/format/optioneltmask.py
+++ b/tests/format/optioneltmask.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream import _yaml
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/optionenum.py b/tests/format/optionenum.py
index b525347f8..5dc336e95 100644
--- a/tests/format/optionenum.py
+++ b/tests/format/optionenum.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream import _yaml
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/optionexports.py b/tests/format/optionexports.py
index 4f95dc109..8731b90b8 100644
--- a/tests/format/optionexports.py
+++ b/tests/format/optionexports.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream import _yaml
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/optionflags.py b/tests/format/optionflags.py
index a3c310f05..9f87572ed 100644
--- a/tests/format/optionflags.py
+++ b/tests/format/optionflags.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream import _yaml
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/optionoverrides.py b/tests/format/optionoverrides.py
index ba12e751f..dc9990889 100644
--- a/tests/format/optionoverrides.py
+++ b/tests/format/optionoverrides.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream import _yaml
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/options.py b/tests/format/options.py
index 4af3495b4..8920da8eb 100644
--- a/tests/format/options.py
+++ b/tests/format/options.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream import _yaml
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/project.py b/tests/format/project.py
index d3de67222..83063a3c0 100644
--- a/tests/format/project.py
+++ b/tests/format/project.py
@@ -2,14 +2,15 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream import _yaml
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing import cli # pylint: disable=unused-import
from tests.testutils import filetypegenerator
-
# Project directory
DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "project")
diff --git a/tests/format/projectoverrides.py b/tests/format/projectoverrides.py
index 16aad2cf8..d25725c7d 100644
--- a/tests/format/projectoverrides.py
+++ b/tests/format/projectoverrides.py
@@ -2,7 +2,9 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
+
from buildstream import _yaml
from buildstream.testing.runcli import cli # pylint: disable=unused-import
diff --git a/tests/format/substitutions.py b/tests/format/substitutions.py
index 265f13e66..026619547 100644
--- a/tests/format/substitutions.py
+++ b/tests/format/substitutions.py
@@ -2,9 +2,10 @@
# pylint: disable=redefined-outer-name
import os
+
import pytest
-from buildstream.testing import cli # pylint: disable=unused-import
+from buildstream.testing import cli # pylint: disable=unused-import
DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "project", "default")
diff --git a/tests/format/variables.py b/tests/format/variables.py
index c5e8eebad..eb77aab45 100644
--- a/tests/format/variables.py
+++ b/tests/format/variables.py
@@ -10,7 +10,6 @@ from buildstream import _yaml
from buildstream.exceptions import ErrorDomain, LoadErrorReason
from buildstream.testing.runcli import cli # pylint: disable=unused-import
-
# Project directory
DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "variables")
View Lorry Controller Status