diff options
| author | Tristan Maat <tristan.maat@codethink.co.uk> | 2017-09-07 14:59:23 +0100 |
|---|---|---|
| committer | Tristan Maat <tristan.maat@codethink.co.uk> | 2017-09-14 11:05:21 +0100 |
| commit | 6bb468a00d76896a0a4da1e5e02bd9c0023ff954 (patch) | |
| tree | dd5c14f7dc436e755414e8ab97be6b9fc133c9b0 | |
| parent | d56f472ddc6b6ff364aaa74cf1dac30be0d774de (diff) | |
| download | buildstream-24-better-validation-for-loaded-yaml.tar.gz | |
Fix affected test cases24-better-validation-for-loaded-yaml
| -rw-r--r-- | tests/loader/variants.py | 2 | ||||
| -rw-r--r-- | tests/loader/variants/elements/disagreement-no-choice.bst | 9 | ||||
| -rw-r--r-- | tests/loader/variants/elements/disagreement-one-no-choice.bst | 5 | ||||
| -rw-r--r-- | tests/loader/variants/elements/disagreement-two-no-choice.bst | 5 | ||||
| -rw-r--r-- | tests/sources/git.py | 6 |
5 files changed, 23 insertions, 4 deletions
diff --git a/tests/loader/variants.py b/tests/loader/variants.py index ad23389e8..6fe28c08d 100644 --- a/tests/loader/variants.py +++ b/tests/loader/variants.py @@ -346,7 +346,7 @@ def test_engine_resolve_agreement(datafiles): def test_engine_disagreement(datafiles): basedir = os.path.join(datafiles.dirname, datafiles.basename) - loader = Loader(basedir, 'elements/disagreement.bst', None, None, None, []) + loader = Loader(basedir, 'elements/disagreement-no-choice.bst', None, None, None, []) with pytest.raises(LoadError) as exc: element = loader.load() diff --git a/tests/loader/variants/elements/disagreement-no-choice.bst b/tests/loader/variants/elements/disagreement-no-choice.bst new file mode 100644 index 000000000..81f989c5b --- /dev/null +++ b/tests/loader/variants/elements/disagreement-no-choice.bst @@ -0,0 +1,9 @@ +kind: disagreement +description: | + This pipeline cannot be built because elements are in disagreement about + what variants to choose + +depends: +- elements/disagreement-one-no-choice.bst +- filename: elements/disagreement-two-no-choice.bst + variant: second diff --git a/tests/loader/variants/elements/disagreement-one-no-choice.bst b/tests/loader/variants/elements/disagreement-one-no-choice.bst new file mode 100644 index 000000000..07781e0ab --- /dev/null +++ b/tests/loader/variants/elements/disagreement-one-no-choice.bst @@ -0,0 +1,5 @@ +kind: color +description: Something or other +depends: +- filename: elements/disagreement-two-no-choice.bst + variant: first diff --git a/tests/loader/variants/elements/disagreement-two-no-choice.bst b/tests/loader/variants/elements/disagreement-two-no-choice.bst new file mode 100644 index 000000000..d16bf95bc --- /dev/null +++ b/tests/loader/variants/elements/disagreement-two-no-choice.bst @@ -0,0 +1,5 @@ +kind: color +description: Something or other +variants: +- variant: first +- variant: second diff --git a/tests/sources/git.py b/tests/sources/git.py index 43a64a0c8..a3649a863 100644 --- a/tests/sources/git.py +++ b/tests/sources/git.py @@ -80,9 +80,9 @@ class GitSubmoduleSetup(GitSetup): if url: template += " ref: {ref}\n" - template += "submodules:\n" + \ - " subrepo:\n" + \ - " url: {subrepo}\n" + template += " submodules:\n" + \ + " subrepo:\n" + \ + " url: {subrepo}\n" final = template.format(url=url, ref=ref, track=track, subrepo=self.subrepo_url) |