diff options
Diffstat (limited to 'tests/format')
97 files changed, 99 insertions, 18 deletions
diff --git a/tests/format/assertion/project.conf b/tests/format/assertion/project.conf index 4c0016692..5a1fd091a 100644 --- a/tests/format/assertion/project.conf +++ b/tests/format/assertion/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: pony: diff --git a/tests/format/dependencies1/project.conf b/tests/format/dependencies1/project.conf index fcd60b6df..7c4d2353f 100644 --- a/tests/format/dependencies1/project.conf +++ b/tests/format/dependencies1/project.conf @@ -1,3 +1,3 @@ -# Basic project name: test +version: 2.0 element-path: elements diff --git a/tests/format/dependencies2/project.conf b/tests/format/dependencies2/project.conf index 2027cc27a..0932d16b3 100644 --- a/tests/format/dependencies2/project.conf +++ b/tests/format/dependencies2/project.conf @@ -1,3 +1,2 @@ -# Basic project configuration that doesnt override anything -# name: pony +version: 2.0 diff --git a/tests/format/include.py b/tests/format/include.py index 4b1da920b..1143bd4e2 100644 --- a/tests/format/include.py +++ b/tests/format/include.py @@ -32,7 +32,7 @@ def test_include_project_file(cli, datafiles): def test_include_missing_file(cli, tmpdir): - tmpdir.join('project.conf').write('{"name": "test"}') + tmpdir.join('project.conf').write('{"name": "test", "version": "2.0"}') element = tmpdir.join('include_missing_file.bst') # Normally we would use dicts and _yaml.dump to write such things, but here @@ -51,7 +51,7 @@ def test_include_missing_file(cli, tmpdir): def test_include_dir(cli, tmpdir): - tmpdir.join('project.conf').write('{"name": "test"}') + tmpdir.join('project.conf').write('{"name": "test", "version": "2.0"}') tmpdir.mkdir('subdir') element = tmpdir.join('include_dir.bst') diff --git a/tests/format/include/conditional/project.conf b/tests/format/include/conditional/project.conf index cb54779d3..46e3c0be4 100644 --- a/tests/format/include/conditional/project.conf +++ b/tests/format/include/conditional/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: build_arch: diff --git a/tests/format/include/eventual_overrides/project.conf b/tests/format/include/eventual_overrides/project.conf index b32753625..91db2ee07 100644 --- a/tests/format/include/eventual_overrides/project.conf +++ b/tests/format/include/eventual_overrides/project.conf @@ -1 +1,2 @@ name: test +version: 2.0 diff --git a/tests/format/include/file/project.conf b/tests/format/include/file/project.conf index a7791a416..cdcfbc143 100644 --- a/tests/format/include/file/project.conf +++ b/tests/format/include/file/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 (@): - extra_conf.yml diff --git a/tests/format/include/file_with_subproject/project.conf b/tests/format/include/file_with_subproject/project.conf index a7791a416..cdcfbc143 100644 --- a/tests/format/include/file_with_subproject/project.conf +++ b/tests/format/include/file_with_subproject/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 (@): - extra_conf.yml diff --git a/tests/format/include/file_with_subproject/subproject/project.conf b/tests/format/include/file_with_subproject/subproject/project.conf index 7a6655421..733abed25 100644 --- a/tests/format/include/file_with_subproject/subproject/project.conf +++ b/tests/format/include/file_with_subproject/subproject/project.conf @@ -1 +1,2 @@ name: test-sub +version: 2.0 diff --git a/tests/format/include/inner/project.conf b/tests/format/include/inner/project.conf index 8bdfc428a..3cca4c3d5 100644 --- a/tests/format/include/inner/project.conf +++ b/tests/format/include/inner/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: (@): diff --git a/tests/format/include/junction/project.conf b/tests/format/include/junction/project.conf index 4836c5f8b..6a56aaac8 100644 --- a/tests/format/include/junction/project.conf +++ b/tests/format/include/junction/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 (@): - junction.bst:extra_conf.yml diff --git a/tests/format/include/junction/subproject/project.conf b/tests/format/include/junction/subproject/project.conf index 7a6655421..733abed25 100644 --- a/tests/format/include/junction/subproject/project.conf +++ b/tests/format/include/junction/subproject/project.conf @@ -1 +1,2 @@ name: test-sub +version: 2.0 diff --git a/tests/format/include/local_to_junction/project.conf b/tests/format/include/local_to_junction/project.conf index 4836c5f8b..6a56aaac8 100644 --- a/tests/format/include/local_to_junction/project.conf +++ b/tests/format/include/local_to_junction/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 (@): - junction.bst:extra_conf.yml diff --git a/tests/format/include/local_to_junction/subproject/project.conf b/tests/format/include/local_to_junction/subproject/project.conf index 7a6655421..733abed25 100644 --- a/tests/format/include/local_to_junction/subproject/project.conf +++ b/tests/format/include/local_to_junction/subproject/project.conf @@ -1 +1,2 @@ name: test-sub +version: 2.0 diff --git a/tests/format/include/options/project.conf b/tests/format/include/options/project.conf index a7791a416..cdcfbc143 100644 --- a/tests/format/include/options/project.conf +++ b/tests/format/include/options/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 (@): - extra_conf.yml diff --git a/tests/format/include/overrides-junction/project.conf b/tests/format/include/overrides-junction/project.conf index d03bec634..e3a017915 100644 --- a/tests/format/include/overrides-junction/project.conf +++ b/tests/format/include/overrides-junction/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 elements: junction: diff --git a/tests/format/include/overrides-junction/subproject/project.conf b/tests/format/include/overrides-junction/subproject/project.conf index 7a6655421..733abed25 100644 --- a/tests/format/include/overrides-junction/subproject/project.conf +++ b/tests/format/include/overrides-junction/subproject/project.conf @@ -1 +1,2 @@ name: test-sub +version: 2.0 diff --git a/tests/format/include/overrides/project.conf b/tests/format/include/overrides/project.conf index fa3c75703..4bc8f63d3 100644 --- a/tests/format/include/overrides/project.conf +++ b/tests/format/include/overrides/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 elements: junction: diff --git a/tests/format/include/overrides/subproject/project.conf b/tests/format/include/overrides/subproject/project.conf index 7a6655421..733abed25 100644 --- a/tests/format/include/overrides/subproject/project.conf +++ b/tests/format/include/overrides/subproject/project.conf @@ -1 +1,2 @@ name: test-sub +version: 2.0 diff --git a/tests/format/include/recursive/project.conf b/tests/format/include/recursive/project.conf index a7791a416..cdcfbc143 100644 --- a/tests/format/include/recursive/project.conf +++ b/tests/format/include/recursive/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 (@): - extra_conf.yml diff --git a/tests/format/include/string/project.conf b/tests/format/include/string/project.conf index 6ee9988e9..4276b3eee 100644 --- a/tests/format/include/string/project.conf +++ b/tests/format/include/string/project.conf @@ -1,3 +1,4 @@ name: test +version: 2.0 (@): extra_conf.yml diff --git a/tests/format/include/sub-include/project.conf b/tests/format/include/sub-include/project.conf index 7f7df84c8..4dd5b2809 100644 --- a/tests/format/include/sub-include/project.conf +++ b/tests/format/include/sub-include/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 elements: manual: diff --git a/tests/format/include_composition.py b/tests/format/include_composition.py index 00097ea6b..2c880dd6e 100644 --- a/tests/format/include_composition.py +++ b/tests/format/include_composition.py @@ -6,7 +6,7 @@ from buildstream2 import _yaml def make_includes(basedir): - _yaml.dump({'name': 'test'}, + _yaml.dump({'name': 'test', 'version': '2.0'}, os.path.join(basedir, 'project.conf')) context = Context() project = Project(basedir, context) diff --git a/tests/format/junctions/bar/project.conf b/tests/format/junctions/bar/project.conf index f8ed6621d..a8ef1cca5 100644 --- a/tests/format/junctions/bar/project.conf +++ b/tests/format/junctions/bar/project.conf @@ -1 +1,2 @@ name: bar +version: 2.0 diff --git a/tests/format/junctions/base/project.conf b/tests/format/junctions/base/project.conf index 951ea1a34..5ab1fe9cd 100644 --- a/tests/format/junctions/base/project.conf +++ b/tests/format/junctions/base/project.conf @@ -1 +1,2 @@ name: base +version: 2.0 diff --git a/tests/format/junctions/conflict/project.conf b/tests/format/junctions/conflict/project.conf index 395bb8423..fd429e4f9 100644 --- a/tests/format/junctions/conflict/project.conf +++ b/tests/format/junctions/conflict/project.conf @@ -1 +1,2 @@ name: conflict +version: 2.0 diff --git a/tests/format/junctions/foo/project.conf b/tests/format/junctions/foo/project.conf index 5a240e3ed..a0b5d61ac 100644 --- a/tests/format/junctions/foo/project.conf +++ b/tests/format/junctions/foo/project.conf @@ -1 +1,2 @@ name: foo +version: 2.0 diff --git a/tests/format/junctions/inconsistent-names/junctionA/junctionB/project.conf b/tests/format/junctions/inconsistent-names/junctionA/junctionB/project.conf index 2e96170f8..9c41e1337 100644 --- a/tests/format/junctions/inconsistent-names/junctionA/junctionB/project.conf +++ b/tests/format/junctions/inconsistent-names/junctionA/junctionB/project.conf @@ -1,5 +1,6 @@ # Unique project name name: projectB +version: 2.0 # Subdirectory where elements are stored element-path: elements diff --git a/tests/format/junctions/inconsistent-names/junctionA/project.conf b/tests/format/junctions/inconsistent-names/junctionA/project.conf index 166c4b78c..14924ba26 100644 --- a/tests/format/junctions/inconsistent-names/junctionA/project.conf +++ b/tests/format/junctions/inconsistent-names/junctionA/project.conf @@ -1,5 +1,6 @@ # Unique project name name: projectA +version: 2.0 # Subdirectory where elements are stored element-path: elements diff --git a/tests/format/junctions/inconsistent-names/project.conf b/tests/format/junctions/inconsistent-names/project.conf index 064bbc588..200a970f0 100644 --- a/tests/format/junctions/inconsistent-names/project.conf +++ b/tests/format/junctions/inconsistent-names/project.conf @@ -1,5 +1,6 @@ # Unique project name name: inconsistent-names +version: 2.0 # Subdirectory where elements are stored element-path: elements diff --git a/tests/format/junctions/invalid/project.conf b/tests/format/junctions/invalid/project.conf index 38070bf71..75ca8e402 100644 --- a/tests/format/junctions/invalid/project.conf +++ b/tests/format/junctions/invalid/project.conf @@ -1 +1,2 @@ name: invalid +version: 2.0 diff --git a/tests/format/junctions/missing-element/junctionA/junctionB/project.conf b/tests/format/junctions/missing-element/junctionA/junctionB/project.conf index 41b8d6c72..929fcd615 100644 --- a/tests/format/junctions/missing-element/junctionA/junctionB/project.conf +++ b/tests/format/junctions/missing-element/junctionA/junctionB/project.conf @@ -1 +1,2 @@ name: projectB +version: 2.0 diff --git a/tests/format/junctions/missing-element/junctionA/project.conf b/tests/format/junctions/missing-element/junctionA/project.conf index 5f6ab28a2..eb367c684 100644 --- a/tests/format/junctions/missing-element/junctionA/project.conf +++ b/tests/format/junctions/missing-element/junctionA/project.conf @@ -1 +1,2 @@ name: projectA +version: 2.0 diff --git a/tests/format/junctions/missing-element/project.conf b/tests/format/junctions/missing-element/project.conf index b32753625..91db2ee07 100644 --- a/tests/format/junctions/missing-element/project.conf +++ b/tests/format/junctions/missing-element/project.conf @@ -1 +1,2 @@ name: test +version: 2.0 diff --git a/tests/format/junctions/nested/project.conf b/tests/format/junctions/nested/project.conf index 551f51c6a..37e651af0 100644 --- a/tests/format/junctions/nested/project.conf +++ b/tests/format/junctions/nested/project.conf @@ -1 +1,2 @@ name: nested +version: 2.0 diff --git a/tests/format/junctions/options-base/project.conf b/tests/format/junctions/options-base/project.conf index a98ebd5ed..a445a66db 100644 --- a/tests/format/junctions/options-base/project.conf +++ b/tests/format/junctions/options-base/project.conf @@ -1,4 +1,5 @@ name: options-base +version: 2.0 options: animal: type: enum diff --git a/tests/format/junctions/options-default/project.conf b/tests/format/junctions/options-default/project.conf index b9e58a582..f1bc5def1 100644 --- a/tests/format/junctions/options-default/project.conf +++ b/tests/format/junctions/options-default/project.conf @@ -1 +1,2 @@ name: options-default +version: 2.0 diff --git a/tests/format/junctions/options-inherit/project.conf b/tests/format/junctions/options-inherit/project.conf index 1e0ea4464..e9ffe5c92 100644 --- a/tests/format/junctions/options-inherit/project.conf +++ b/tests/format/junctions/options-inherit/project.conf @@ -1,4 +1,5 @@ name: options-inherit +version: 2.0 options: animal: type: enum diff --git a/tests/format/junctions/options/project.conf b/tests/format/junctions/options/project.conf index de53ae176..b9b9d5649 100644 --- a/tests/format/junctions/options/project.conf +++ b/tests/format/junctions/options/project.conf @@ -1 +1,2 @@ name: options +version: 2.0 diff --git a/tests/format/junctions/toplevel/project.conf b/tests/format/junctions/toplevel/project.conf index 496c82128..acf57b2be 100644 --- a/tests/format/junctions/toplevel/project.conf +++ b/tests/format/junctions/toplevel/project.conf @@ -1 +1,2 @@ name: toplevel +version: 2.0 diff --git a/tests/format/list-directive-error-element/project.conf b/tests/format/list-directive-error-element/project.conf index b32753625..91db2ee07 100644 --- a/tests/format/list-directive-error-element/project.conf +++ b/tests/format/list-directive-error-element/project.conf @@ -1 +1,2 @@ name: test +version: 2.0 diff --git a/tests/format/list-directive-error-project/project.conf b/tests/format/list-directive-error-project/project.conf index 2d66408a8..13ca9a895 100644 --- a/tests/format/list-directive-error-project/project.conf +++ b/tests/format/list-directive-error-project/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 artifacts: (>): diff --git a/tests/format/list-directive-type-error/project.conf b/tests/format/list-directive-type-error/project.conf index 79f73402b..330589fa7 100644 --- a/tests/format/list-directive-type-error/project.conf +++ b/tests/format/list-directive-type-error/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: arch: diff --git a/tests/format/option-arch-alias/project.conf b/tests/format/option-arch-alias/project.conf index 47f0945c9..6f7e1bbb3 100644 --- a/tests/format/option-arch-alias/project.conf +++ b/tests/format/option-arch-alias/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: machine_arch: diff --git a/tests/format/option-arch-unknown/project.conf b/tests/format/option-arch-unknown/project.conf index 0827ec387..c3e0ca303 100644 --- a/tests/format/option-arch-unknown/project.conf +++ b/tests/format/option-arch-unknown/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: machine_arch: diff --git a/tests/format/option-arch/project.conf b/tests/format/option-arch/project.conf index 8b94232cf..f391552b1 100644 --- a/tests/format/option-arch/project.conf +++ b/tests/format/option-arch/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: machine_arch: diff --git a/tests/format/option-bool/project.conf b/tests/format/option-bool/project.conf index a51c4fcbe..a11d9c846 100644 --- a/tests/format/option-bool/project.conf +++ b/tests/format/option-bool/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: pony: diff --git a/tests/format/option-element-mask-invalid/project.conf b/tests/format/option-element-mask-invalid/project.conf index a3d381855..a52a15a13 100644 --- a/tests/format/option-element-mask-invalid/project.conf +++ b/tests/format/option-element-mask-invalid/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: debug_elements: diff --git a/tests/format/option-element-mask/project.conf b/tests/format/option-element-mask/project.conf index ede07fbdd..23c913299 100644 --- a/tests/format/option-element-mask/project.conf +++ b/tests/format/option-element-mask/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: debug_elements: diff --git a/tests/format/option-enum-missing/project.conf b/tests/format/option-enum-missing/project.conf index d6cd7049a..9eac7e7e4 100644 --- a/tests/format/option-enum-missing/project.conf +++ b/tests/format/option-enum-missing/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: empty: diff --git a/tests/format/option-enum/project.conf b/tests/format/option-enum/project.conf index 0b8ea6d1e..3cfe5ac03 100644 --- a/tests/format/option-enum/project.conf +++ b/tests/format/option-enum/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: brother: diff --git a/tests/format/option-exports/project.conf b/tests/format/option-exports/project.conf index e81a31347..e7fb54758 100644 --- a/tests/format/option-exports/project.conf +++ b/tests/format/option-exports/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: diff --git a/tests/format/option-flags-missing/project.conf b/tests/format/option-flags-missing/project.conf index 6554022e4..c45ad1fe5 100644 --- a/tests/format/option-flags-missing/project.conf +++ b/tests/format/option-flags-missing/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: empty: diff --git a/tests/format/option-flags/project.conf b/tests/format/option-flags/project.conf index 1cab9e315..0a7adaf07 100644 --- a/tests/format/option-flags/project.conf +++ b/tests/format/option-flags/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: # Include an enum option here so we can compare it diff --git a/tests/format/option-os/project.conf b/tests/format/option-os/project.conf index 5edb5072f..dc9a89c38 100644 --- a/tests/format/option-os/project.conf +++ b/tests/format/option-os/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: machine_os: diff --git a/tests/format/option-overrides/project.conf b/tests/format/option-overrides/project.conf index c8058f076..afc898546 100644 --- a/tests/format/option-overrides/project.conf +++ b/tests/format/option-overrides/project.conf @@ -2,6 +2,7 @@ # in the element overrides. # name: test +version: 2.0 options: arch: diff --git a/tests/format/options/compound-and-condition/project.conf b/tests/format/options/compound-and-condition/project.conf index 650d017bd..ac4399f40 100644 --- a/tests/format/options/compound-and-condition/project.conf +++ b/tests/format/options/compound-and-condition/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: debug: diff --git a/tests/format/options/compound-or-condition/project.conf b/tests/format/options/compound-or-condition/project.conf index c59cc64f3..8266d1c87 100644 --- a/tests/format/options/compound-or-condition/project.conf +++ b/tests/format/options/compound-or-condition/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: debug: diff --git a/tests/format/options/deep-nesting/project.conf b/tests/format/options/deep-nesting/project.conf index d912cd19e..9d706f5ea 100644 --- a/tests/format/options/deep-nesting/project.conf +++ b/tests/format/options/deep-nesting/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: pony: type: bool diff --git a/tests/format/options/invalid-condition/project.conf b/tests/format/options/invalid-condition/project.conf index b31f35c95..8c5d9a247 100644 --- a/tests/format/options/invalid-condition/project.conf +++ b/tests/format/options/invalid-condition/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: opt: diff --git a/tests/format/options/invalid-expression/project.conf b/tests/format/options/invalid-expression/project.conf index ee0147232..d5c448334 100644 --- a/tests/format/options/invalid-expression/project.conf +++ b/tests/format/options/invalid-expression/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: opt: diff --git a/tests/format/options/invalid-name-dashes/project.conf b/tests/format/options/invalid-name-dashes/project.conf index 045ce564f..965aa7552 100644 --- a/tests/format/options/invalid-name-dashes/project.conf +++ b/tests/format/options/invalid-name-dashes/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: name-with-dashes: diff --git a/tests/format/options/invalid-name-leading-number/project.conf b/tests/format/options/invalid-name-leading-number/project.conf index bb3e2ef6d..eee282539 100644 --- a/tests/format/options/invalid-name-leading-number/project.conf +++ b/tests/format/options/invalid-name-leading-number/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: 123number_is_first: diff --git a/tests/format/options/invalid-name-plus/project.conf b/tests/format/options/invalid-name-plus/project.conf index d62869e73..e060277a5 100644 --- a/tests/format/options/invalid-name-plus/project.conf +++ b/tests/format/options/invalid-name-plus/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: name_with_+: diff --git a/tests/format/options/invalid-name-spaces/project.conf b/tests/format/options/invalid-name-spaces/project.conf index 66931e28c..f7ed2566b 100644 --- a/tests/format/options/invalid-name-spaces/project.conf +++ b/tests/format/options/invalid-name-spaces/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: name with spaces: diff --git a/tests/format/options/invalid-type/project.conf b/tests/format/options/invalid-type/project.conf index b4280cdb6..653c91901 100644 --- a/tests/format/options/invalid-type/project.conf +++ b/tests/format/options/invalid-type/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: opt: diff --git a/tests/format/options/invalid-variable-name-plus/project.conf b/tests/format/options/invalid-variable-name-plus/project.conf index 5652bb8b3..c0595e5af 100644 --- a/tests/format/options/invalid-variable-name-plus/project.conf +++ b/tests/format/options/invalid-variable-name-plus/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: pony: diff --git a/tests/format/options/invalid-variable-name-spaces/project.conf b/tests/format/options/invalid-variable-name-spaces/project.conf index 5115115bf..e14c4de26 100644 --- a/tests/format/options/invalid-variable-name-spaces/project.conf +++ b/tests/format/options/invalid-variable-name-spaces/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: pony: diff --git a/tests/format/options/nested-condition/project.conf b/tests/format/options/nested-condition/project.conf index 104b89571..91b730a12 100644 --- a/tests/format/options/nested-condition/project.conf +++ b/tests/format/options/nested-condition/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: debug: diff --git a/tests/format/options/simple-condition/project.conf b/tests/format/options/simple-condition/project.conf index b6bd29fb4..5afcfbda6 100644 --- a/tests/format/options/simple-condition/project.conf +++ b/tests/format/options/simple-condition/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: opt: diff --git a/tests/format/options/undefined-variable/project.conf b/tests/format/options/undefined-variable/project.conf index d634ef0a4..b1182ca6d 100644 --- a/tests/format/options/undefined-variable/project.conf +++ b/tests/format/options/undefined-variable/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 options: pony: diff --git a/tests/format/project-overrides/prepend-configure-commands/project.conf b/tests/format/project-overrides/prepend-configure-commands/project.conf index 439a21809..3e95b2b14 100644 --- a/tests/format/project-overrides/prepend-configure-commands/project.conf +++ b/tests/format/project-overrides/prepend-configure-commands/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 # Test that prepending to configure-commands works elements: diff --git a/tests/format/project.py b/tests/format/project.py index 4ddd1d88f..e6f4f9408 100644 --- a/tests/format/project.py +++ b/tests/format/project.py @@ -189,6 +189,7 @@ def test_plugin_no_load_ref(cli, datafiles, ref_storage): # config = { 'name': 'test', + 'version': '2.0', 'ref-storage': ref_storage, 'plugins': [ { diff --git a/tests/format/project/default/project.conf b/tests/format/project/default/project.conf index fd3134c58..c2c1d5fd5 100644 --- a/tests/format/project/default/project.conf +++ b/tests/format/project/default/project.conf @@ -2,3 +2,4 @@ # name: pony +version: 2.0 diff --git a/tests/format/project/duplicate-plugins/project.conf b/tests/format/project/duplicate-plugins/project.conf index 4b8f5be5f..e755c2678 100644 --- a/tests/format/project/duplicate-plugins/project.conf +++ b/tests/format/project/duplicate-plugins/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 plugins: - origin: local diff --git a/tests/format/project/element-path/project.conf b/tests/format/project/element-path/project.conf index 57e87de4f..51ffd4b7d 100644 --- a/tests/format/project/element-path/project.conf +++ b/tests/format/project/element-path/project.conf @@ -1,2 +1,3 @@ name: foo +version: 2.0 element-path: elements diff --git a/tests/format/project/empty-depends/project.conf b/tests/format/project/empty-depends/project.conf index b32753625..91db2ee07 100644 --- a/tests/format/project/empty-depends/project.conf +++ b/tests/format/project/empty-depends/project.conf @@ -1 +1,2 @@ name: test +version: 2.0 diff --git a/tests/format/project/emptyname/project.conf b/tests/format/project/emptyname/project.conf index 2c5cf0783..9e74f92c0 100644 --- a/tests/format/project/emptyname/project.conf +++ b/tests/format/project/emptyname/project.conf @@ -2,3 +2,4 @@ # this one is an empty string # name: '' +version: 2.0 diff --git a/tests/format/project/invalid-yaml/project.conf b/tests/format/project/invalid-yaml/project.conf index 5f9282bbf..e6ac02f21 100644 --- a/tests/format/project/invalid-yaml/project.conf +++ b/tests/format/project/invalid-yaml/project.conf @@ -1,7 +1,5 @@ -# Basic project configuration that doesnt override anything -# - name: pony +version: 2.0 variables: sbindir: "%{bindir} diff --git a/tests/format/project/invalidname/project.conf b/tests/format/project/invalidname/project.conf index 3b064d7ec..5fec88bcc 100644 --- a/tests/format/project/invalidname/project.conf +++ b/tests/format/project/invalidname/project.conf @@ -2,3 +2,4 @@ # this one contains a space # name: Project Name +version: 2.0 diff --git a/tests/format/project/local-plugin/project.conf b/tests/format/project/local-plugin/project.conf index 97166e350..b6b63088d 100644 --- a/tests/format/project/local-plugin/project.conf +++ b/tests/format/project/local-plugin/project.conf @@ -1,4 +1,5 @@ name: foo +version: 2.0 plugins: - origin: local path: plugins diff --git a/tests/format/project/missing-element/project.conf b/tests/format/project/missing-element/project.conf index b32753625..91db2ee07 100644 --- a/tests/format/project/missing-element/project.conf +++ b/tests/format/project/missing-element/project.conf @@ -1 +1,2 @@ name: test +version: 2.0 diff --git a/tests/format/project/missing-junction/project.conf b/tests/format/project/missing-junction/project.conf index b32753625..91db2ee07 100644 --- a/tests/format/project/missing-junction/project.conf +++ b/tests/format/project/missing-junction/project.conf @@ -1 +1,2 @@ name: test +version: 2.0 diff --git a/tests/format/project/missingname/project.conf b/tests/format/project/missingname/project.conf index e69de29bb..6ec12fe97 100644 --- a/tests/format/project/missingname/project.conf +++ b/tests/format/project/missingname/project.conf @@ -0,0 +1 @@ +version: 2.0 diff --git a/tests/format/project/overridepath/project.conf b/tests/format/project/overridepath/project.conf index ef1d01c59..730ba19d5 100644 --- a/tests/format/project/overridepath/project.conf +++ b/tests/format/project/overridepath/project.conf @@ -1,6 +1,7 @@ # A project configuration which overrides the sandbox PATH environment variable name: foo +version: 2.0 environment: PATH: /bin:/sbin diff --git a/tests/format/project/plugin-allowed/project.conf b/tests/format/project/plugin-allowed/project.conf index d49e40d48..582fc2efb 100644 --- a/tests/format/project/plugin-allowed/project.conf +++ b/tests/format/project/plugin-allowed/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 plugins: - origin: local diff --git a/tests/format/project/plugin-forbidden/project.conf b/tests/format/project/plugin-forbidden/project.conf index 39cc3d65f..785b02c88 100644 --- a/tests/format/project/plugin-forbidden/project.conf +++ b/tests/format/project/plugin-forbidden/project.conf @@ -1,2 +1,3 @@ name: test +version: 2.0 diff --git a/tests/format/project/plugin-preflight-error/project.conf b/tests/format/project/plugin-preflight-error/project.conf index 20a234413..31dcf121e 100644 --- a/tests/format/project/plugin-preflight-error/project.conf +++ b/tests/format/project/plugin-preflight-error/project.conf @@ -1,6 +1,7 @@ # Basic project configuration that doesnt override anything # name: pony +version: 2.0 # Whitelist the local test Source "errorplugin" to be loaded # diff --git a/tests/format/project/project-from-subdir/project.conf b/tests/format/project/project-from-subdir/project.conf index fd3134c58..0932d16b3 100644 --- a/tests/format/project/project-from-subdir/project.conf +++ b/tests/format/project/project-from-subdir/project.conf @@ -1,4 +1,2 @@ -# Basic project configuration that doesnt override anything -# - name: pony +version: 2.0 diff --git a/tests/format/project/refs-options/project.conf b/tests/format/project/refs-options/project.conf index a44806da0..0163d5622 100644 --- a/tests/format/project/refs-options/project.conf +++ b/tests/format/project/refs-options/project.conf @@ -1,4 +1,5 @@ name: test +version: 2.0 ref-storage: project.refs options: diff --git a/tests/format/project/unsupported/project.conf b/tests/format/project/unsupported/project.conf index ecd8e06cc..a66b6241a 100644 --- a/tests/format/project/unsupported/project.conf +++ b/tests/format/project/unsupported/project.conf @@ -1,3 +1,4 @@ # A project which requires a too new version of the format name: foo +version: 2.0 format-version: 5000 diff --git a/tests/format/variables.py b/tests/format/variables.py index 4a954ebde..f1185e934 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -106,6 +106,7 @@ def test_use_of_protected_var_project_conf(cli, datafiles, protected_var): project = str(datafiles) conf = { 'name': 'test', + 'version': '2.0', 'variables': { protected_var: 'some-value' } @@ -134,6 +135,7 @@ def test_use_of_protected_var_element_overrides(cli, datafiles, protected_var): project = str(datafiles) conf = { 'name': 'test', + 'version': '2.0', 'elements': { 'manual': { 'variables': { diff --git a/tests/format/variables/cyclic_variables/project.conf b/tests/format/variables/cyclic_variables/project.conf index b32753625..91db2ee07 100644 --- a/tests/format/variables/cyclic_variables/project.conf +++ b/tests/format/variables/cyclic_variables/project.conf @@ -1 +1,2 @@ name: test +version: 2.0 diff --git a/tests/format/variables/defaults/project.conf b/tests/format/variables/defaults/project.conf index 2027cc27a..0932d16b3 100644 --- a/tests/format/variables/defaults/project.conf +++ b/tests/format/variables/defaults/project.conf @@ -1,3 +1,2 @@ -# Basic project configuration that doesnt override anything -# name: pony +version: 2.0 diff --git a/tests/format/variables/missing_variables/project.conf b/tests/format/variables/missing_variables/project.conf index 2027cc27a..0932d16b3 100644 --- a/tests/format/variables/missing_variables/project.conf +++ b/tests/format/variables/missing_variables/project.conf @@ -1,3 +1,2 @@ -# Basic project configuration that doesnt override anything -# name: pony +version: 2.0 diff --git a/tests/format/variables/overrides/project.conf b/tests/format/variables/overrides/project.conf index 2027cc27a..0932d16b3 100644 --- a/tests/format/variables/overrides/project.conf +++ b/tests/format/variables/overrides/project.conf @@ -1,3 +1,2 @@ -# Basic project configuration that doesnt override anything -# name: pony +version: 2.0 diff --git a/tests/format/variables/protected-vars/project.conf b/tests/format/variables/protected-vars/project.conf index 5a240e3ed..a0b5d61ac 100644 --- a/tests/format/variables/protected-vars/project.conf +++ b/tests/format/variables/protected-vars/project.conf @@ -1 +1,2 @@ name: foo +version: 2.0 |