summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTristan van Berkom <tristan@codethink.co.uk>2020-09-02 16:04:40 +0900
committerTristan van Berkom <tristan@codethink.co.uk>2020-09-18 12:38:49 +0900
commit3131e0cc1078607367987a89f932ae8071f34c76 (patch)
treede181ee792375ca4554b25fa2761d1c7f7365f2e /tests
parent247aad32d3046068c793463190fbd3248379f096 (diff)
downloadbuildstream-3131e0cc1078607367987a89f932ae8071f34c76.tar.gz
tests/format/dependencies.py: Remove tests for LoadErrorReason.DUPLICATE_DEPENDENCY
Diffstat (limited to 'tests')
-rw-r--r--tests/format/dependencies.py25
-rw-r--r--tests/format/dependencies3/all-all.bst11
-rw-r--r--tests/format/dependencies3/build-all.bst11
-rw-r--r--tests/format/dependencies3/build-build.bst11
-rw-r--r--tests/format/dependencies3/build-runtime.bst11
-rw-r--r--tests/format/dependencies3/dep.bst4
-rw-r--r--tests/format/dependencies3/project.conf2
-rw-r--r--tests/format/dependencies3/runtime-all.bst11
-rw-r--r--tests/format/dependencies3/runtime-runtime.bst11
9 files changed, 0 insertions, 97 deletions
diff --git a/tests/format/dependencies.py b/tests/format/dependencies.py
index b1a684081..393f806ad 100644
--- a/tests/format/dependencies.py
+++ b/tests/format/dependencies.py
@@ -232,28 +232,3 @@ def test_no_recurse(cli, datafiles):
"dep-two.bst",
"target.bst",
]
-
-
-@pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.parametrize(
- ("element", "asserts"),
- [
- ("build-runtime", False),
- ("build-build", True),
- ("build-all", True),
- ("runtime-runtime", True),
- ("runtime-all", True),
- ("all-all", True),
- ],
-)
-def test_duplicate_deps(cli, datafiles, element, asserts):
- project = os.path.join(str(datafiles), "dependencies3")
-
- result = cli.run(project=project, args=["show", "{}.bst".format(element)])
-
- if asserts:
- result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.DUPLICATE_DEPENDENCY)
- assert "[line 10 column 2]" in result.stderr
- assert "[line 8 column 2]" in result.stderr
- else:
- result.assert_success()
diff --git a/tests/format/dependencies3/all-all.bst b/tests/format/dependencies3/all-all.bst
deleted file mode 100644
index 98122472d..000000000
--- a/tests/format/dependencies3/all-all.bst
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: import
-
-sources:
-- kind: local
- path: all-all.bst
-
-depends:
-- filename: dep.bst
- type: all
-- filename: dep.bst
- type: all
diff --git a/tests/format/dependencies3/build-all.bst b/tests/format/dependencies3/build-all.bst
deleted file mode 100644
index 4c66524e7..000000000
--- a/tests/format/dependencies3/build-all.bst
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: import
-
-sources:
-- kind: local
- path: all-all.bst
-
-depends:
-- filename: dep.bst
- type: build
-- filename: dep.bst
- type: all
diff --git a/tests/format/dependencies3/build-build.bst b/tests/format/dependencies3/build-build.bst
deleted file mode 100644
index 2a813b3ab..000000000
--- a/tests/format/dependencies3/build-build.bst
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: import
-
-sources:
-- kind: local
- path: all-all.bst
-
-depends:
-- filename: dep.bst
- type: build
-- filename: dep.bst
- type: build
diff --git a/tests/format/dependencies3/build-runtime.bst b/tests/format/dependencies3/build-runtime.bst
deleted file mode 100644
index f740736d8..000000000
--- a/tests/format/dependencies3/build-runtime.bst
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: import
-
-sources:
-- kind: local
- path: all-all.bst
-
-depends:
-- filename: dep.bst
- type: build
-- filename: dep.bst
- type: runtime
diff --git a/tests/format/dependencies3/dep.bst b/tests/format/dependencies3/dep.bst
deleted file mode 100644
index f4f9f6862..000000000
--- a/tests/format/dependencies3/dep.bst
+++ /dev/null
@@ -1,4 +0,0 @@
-kind: import
-sources:
-- kind: local
- path: project.conf
diff --git a/tests/format/dependencies3/project.conf b/tests/format/dependencies3/project.conf
deleted file mode 100644
index 8b361b03d..000000000
--- a/tests/format/dependencies3/project.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-name: dup-dup-checker
-min-version: 2.0
diff --git a/tests/format/dependencies3/runtime-all.bst b/tests/format/dependencies3/runtime-all.bst
deleted file mode 100644
index c08594623..000000000
--- a/tests/format/dependencies3/runtime-all.bst
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: import
-
-sources:
-- kind: local
- path: all-all.bst
-
-depends:
-- filename: dep.bst
- type: runtime
-- filename: dep.bst
- type: all
diff --git a/tests/format/dependencies3/runtime-runtime.bst b/tests/format/dependencies3/runtime-runtime.bst
deleted file mode 100644
index d01181f9b..000000000
--- a/tests/format/dependencies3/runtime-runtime.bst
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: import
-
-sources:
-- kind: local
- path: all-all.bst
-
-depends:
-- filename: dep.bst
- type: runtime
-- filename: dep.bst
- type: runtime