diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-11-30 14:37:42 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-11-30 14:37:42 +0000 |
| commit | 6b961f20a8b2174a342e9b92e68752b2ff19da29 (patch) | |
| tree | 61aa6c0406cbe0f28b361b967d3fd4afc48edd2d | |
| parent | 19a450c37782fdaace658633822213037b3a3990 (diff) | |
| parent | ad39875b790728d61872ac45055da0858edbe21d (diff) | |
| download | buildstream-6b961f20a8b2174a342e9b92e68752b2ff19da29.tar.gz | |
Merge branch 'tristan/version-error-fix' into 'master'
Fix missing cert tests to expect the error for the correct reason
See merge request BuildStream/buildstream!2105
| -rw-r--r-- | tests/artifactcache/config.py | 1 | ||||
| -rw-r--r-- | tests/sandboxes/remote-exec-config.py | 4 | ||||
| -rw-r--r-- | tests/sourcecache/config.py | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/tests/artifactcache/config.py b/tests/artifactcache/config.py index 24d555860..414a6fe17 100644 --- a/tests/artifactcache/config.py +++ b/tests/artifactcache/config.py @@ -147,6 +147,7 @@ def test_missing_certs(cli, datafiles, config_key, config_value): project_conf = { "name": "test", + "min-version": "2.0", "artifacts": {"url": "https://cache.example.com:12345", "push": "true", config_key: config_value}, } project_conf_file = os.path.join(project, "project.conf") diff --git a/tests/sandboxes/remote-exec-config.py b/tests/sandboxes/remote-exec-config.py index a6297834b..27bc38b45 100644 --- a/tests/sandboxes/remote-exec-config.py +++ b/tests/sandboxes/remote-exec-config.py @@ -23,6 +23,7 @@ def test_old_and_new_configs(cli, datafiles): project_conf = { "name": "test", + "min-version": "2.0", "remote-execution": { "url": "https://cache.example.com:12345", "execution-service": {"url": "http://localhost:8088"}, @@ -49,6 +50,7 @@ def test_missing_certs(cli, datafiles, config_key, config_value): project_conf = { "name": "test", + "min-version": "2.0", "remote-execution": { "execution-service": {"url": "http://localhost:8088"}, "storage-service": {"url": "http://charactron:11001", config_key: config_value,}, @@ -69,7 +71,7 @@ def test_missing_certs(cli, datafiles, config_key, config_value): def test_empty_config(cli, datafiles): project = os.path.join(datafiles.dirname, datafiles.basename, "missing-certs") - project_conf = {"name": "test", "remote-execution": {}} + project_conf = {"name": "test", "min-version": "2.0", "remote-execution": {}} project_conf_file = os.path.join(project, "project.conf") _yaml.roundtrip_dump(project_conf, project_conf_file) diff --git a/tests/sourcecache/config.py b/tests/sourcecache/config.py index 0c11a2726..20b5177b7 100644 --- a/tests/sourcecache/config.py +++ b/tests/sourcecache/config.py @@ -42,6 +42,7 @@ def test_missing_certs(cli, datafiles, config_key, config_value): project_conf = { "name": "test", + "min-version": "2.0", "source-caches": {"url": "https://cache.example.com:12345", "push": "true", config_key: config_value}, } project_conf_file = os.path.join(project, "project.conf") |