Merge branch 'bschubert/pylint-fixes' into 'master'

Ensure pylint runs in some tests paths

See merge request BuildStream/buildstream!1378

10 files changed, 30 insertions, 10 deletions

diff --git a/tests/plugins/__init__.py b/tests/plugins/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/plugins/__init__.py
diff --git a/tests/plugins/deprecationwarnings/__init__.py b/tests/plugins/deprecationwarnings/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/plugins/deprecationwarnings/__init__.py
diff --git a/tests/plugins/deprecationwarnings/deprecationwarnings.py b/tests/plugins/deprecationwarnings/deprecationwarnings.py
index 75652bf06..4d2d22c05 100644
--- a/tests/plugins/deprecationwarnings/deprecationwarnings.py
+++ b/tests/plugins/deprecationwarnings/deprecationwarnings.py
@@ -1,6 +1,11 @@
-import pytest
+# Pylint doesn't play well with fixtures and dependency injection from pytest
+# pylint: disable=redefined-outer-name
+
 import os
-from buildstream.testing import cli
+
+import pytest
+
+from buildstream.testing import cli  # pylint: disable=unused-import
 
 
 DATA_DIR = os.path.join(
diff --git a/tests/remoteexecution/__init__.py b/tests/remoteexecution/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/remoteexecution/__init__.py
diff --git a/tests/remoteexecution/partial.py b/tests/remoteexecution/partial.py
index ee0fc25b4..fd7b11cdb 100644
--- a/tests/remoteexecution/partial.py
+++ b/tests/remoteexecution/partial.py
@@ -1,8 +1,11 @@
+# Pylint doesn't play well with fixtures and dependency injection from pytest
+# pylint: disable=redefined-outer-name
+
 import os
 import pytest
 
 from buildstream._exceptions import ErrorDomain
-from buildstream.testing import cli_remote_execution as cli
+from buildstream.testing import cli_remote_execution as cli  # pylint: disable=unused-import
 from buildstream.testing.integration import assert_contains
 
 
diff --git a/tests/remoteexecution/simple.py b/tests/remoteexecution/simple.py
index 53f4c65a4..1b7f7818a 100644
--- a/tests/remoteexecution/simple.py
+++ b/tests/remoteexecution/simple.py
@@ -1,7 +1,10 @@
+# Pylint doesn't play well with fixtures and dependency injection from pytest
+# pylint: disable=redefined-outer-name
+
 import os
 import pytest
 
-from buildstream.testing import cli_remote_execution as cli
+from buildstream.testing import cli_remote_execution as cli  # pylint: disable=unused-import
 from buildstream.testing.integration import assert_contains
 
 
diff --git a/tests/sandboxes/__init__.py b/tests/sandboxes/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/sandboxes/__init__.py
diff --git a/tests/sandboxes/missing-command.py b/tests/sandboxes/missing-command.py
index 8156eac9b..0277389a9 100644
--- a/tests/sandboxes/missing-command.py
+++ b/tests/sandboxes/missing-command.py
@@ -1,9 +1,12 @@
+# Pylint doesn't play well with fixtures and dependency injection from pytest
+# pylint: disable=redefined-outer-name
+
 import os
 import pytest
 
 from buildstream._exceptions import ErrorDomain
 
-from buildstream.testing import cli
+from buildstream.testing import cli  # pylint: disable=unused-import
 
 
 DATA_DIR = os.path.join(
diff --git a/tests/sandboxes/missing_dependencies.py b/tests/sandboxes/missing_dependencies.py
index 22fecaa6e..1f2a50422 100644
--- a/tests/sandboxes/missing_dependencies.py
+++ b/tests/sandboxes/missing_dependencies.py
@@ -1,11 +1,15 @@
+# Pylint doesn't play well with fixtures and dependency injection from pytest
+# pylint: disable=redefined-outer-name
+
 import os
+
 import pytest
-from buildstream.testing import cli
-from tests.testutils.site import IS_LINUX
 
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain
+from buildstream.testing import cli  # pylint: disable=unused-import
 
+from tests.testutils.site import IS_LINUX
 
 # Project directory
 DATA_DIR = os.path.join(
diff --git a/tests/sandboxes/remote-exec-config.py b/tests/sandboxes/remote-exec-config.py
index 82943e4b1..90418d6fc 100644
--- a/tests/sandboxes/remote-exec-config.py
+++ b/tests/sandboxes/remote-exec-config.py
@@ -1,11 +1,13 @@
-import pytest
+# Pylint doesn't play well with fixtures and dependency injection from pytest
+# 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
+from buildstream.testing.runcli import cli  # pylint: disable=unused-import
 
 DATA_DIR = os.path.join(
     os.path.dirname(os.path.realpath(__file__)),