summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2020-04-27 15:35:24 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2020-04-29 16:24:59 +0900
commit3b1af6036c14d4a9b017776358b4ac4c5622ec9e (patch)
tree1b7b3d6664ca527e6066af313847274993373213
parentd63bd7e9def528d3ed59a2798452ac1da58ebea4 (diff)
downloadbuildstream-3b1af6036c14d4a9b017776358b4ac4c5622ec9e.tar.gz
tests/plugins/deprecationwarnings.py: Moved from it's subdirectory
Before adding more tests to this directory, just making the directory match more the structure of other test directories.
-rw-r--r--tests/plugins/deprecationwarnings.py (renamed from tests/plugins/deprecationwarnings/deprecationwarnings.py)2
-rw-r--r--tests/plugins/deprecationwarnings/__init__.py0
-rw-r--r--tests/plugins/deprecationwarnings/elements/deprecated.bst (renamed from tests/plugins/deprecationwarnings/project/elements/deprecated.bst)0
-rw-r--r--tests/plugins/deprecationwarnings/plugins/elements/deprecated_plugin.py (renamed from tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.py)0
-rw-r--r--tests/plugins/deprecationwarnings/plugins/elements/deprecated_plugin.yaml (renamed from tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.yaml)0
-rw-r--r--tests/plugins/deprecationwarnings/project.conf (renamed from tests/plugins/deprecationwarnings/project/project.conf)0
6 files changed, 1 insertions, 1 deletions
diff --git a/tests/plugins/deprecationwarnings/deprecationwarnings.py b/tests/plugins/deprecationwarnings.py
index 628faea68..a4da3ea72 100644
--- a/tests/plugins/deprecationwarnings/deprecationwarnings.py
+++ b/tests/plugins/deprecationwarnings.py
@@ -8,7 +8,7 @@ import pytest
from buildstream.testing import cli # pylint: disable=unused-import
-DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "project")
+DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "deprecationwarnings")
_DEPRECATION_MESSAGE = "Here is some detail."
_DEPRECATION_WARNING = "Using deprecated plugin deprecated_plugin: {}".format(_DEPRECATION_MESSAGE)
diff --git a/tests/plugins/deprecationwarnings/__init__.py b/tests/plugins/deprecationwarnings/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/plugins/deprecationwarnings/__init__.py
+++ /dev/null
diff --git a/tests/plugins/deprecationwarnings/project/elements/deprecated.bst b/tests/plugins/deprecationwarnings/elements/deprecated.bst
index e80bd91cd..e80bd91cd 100644
--- a/tests/plugins/deprecationwarnings/project/elements/deprecated.bst
+++ b/tests/plugins/deprecationwarnings/elements/deprecated.bst
diff --git a/tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.py b/tests/plugins/deprecationwarnings/plugins/elements/deprecated_plugin.py
index 1badf59af..1badf59af 100644
--- a/tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.py
+++ b/tests/plugins/deprecationwarnings/plugins/elements/deprecated_plugin.py
diff --git a/tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.yaml b/tests/plugins/deprecationwarnings/plugins/elements/deprecated_plugin.yaml
index 1c07cd8b2..1c07cd8b2 100644
--- a/tests/plugins/deprecationwarnings/project/plugins/elements/deprecated_plugin.yaml
+++ b/tests/plugins/deprecationwarnings/plugins/elements/deprecated_plugin.yaml
diff --git a/tests/plugins/deprecationwarnings/project/project.conf b/tests/plugins/deprecationwarnings/project.conf
index 9e03afe0a..9e03afe0a 100644
--- a/tests/plugins/deprecationwarnings/project/project.conf
+++ b/tests/plugins/deprecationwarnings/project.conf