From 3131e0cc1078607367987a89f932ae8071f34c76 Mon Sep 17 00:00:00 2001 From: Tristan van Berkom Date: Wed, 2 Sep 2020 16:04:40 +0900 Subject: tests/format/dependencies.py: Remove tests for LoadErrorReason.DUPLICATE_DEPENDENCY --- tests/format/dependencies.py | 25 ------------------------- tests/format/dependencies3/all-all.bst | 11 ----------- tests/format/dependencies3/build-all.bst | 11 ----------- tests/format/dependencies3/build-build.bst | 11 ----------- tests/format/dependencies3/build-runtime.bst | 11 ----------- tests/format/dependencies3/dep.bst | 4 ---- tests/format/dependencies3/project.conf | 2 -- tests/format/dependencies3/runtime-all.bst | 11 ----------- tests/format/dependencies3/runtime-runtime.bst | 11 ----------- 9 files changed, 97 deletions(-) delete mode 100644 tests/format/dependencies3/all-all.bst delete mode 100644 tests/format/dependencies3/build-all.bst delete mode 100644 tests/format/dependencies3/build-build.bst delete mode 100644 tests/format/dependencies3/build-runtime.bst delete mode 100644 tests/format/dependencies3/dep.bst delete mode 100644 tests/format/dependencies3/project.conf delete mode 100644 tests/format/dependencies3/runtime-all.bst delete mode 100644 tests/format/dependencies3/runtime-runtime.bst (limited to 'tests') 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 -- cgit v1.2.1