summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Maat <tristan.maat@codethink.co.uk>2018-03-22 13:05:58 +0000
committerTristan Maat <tristan.maat@codethink.co.uk>2018-03-27 14:32:55 +0100
commitbe5a8638264dfe6b96eabfc0e0b6582ec7091d6c (patch)
tree8edcaa164549cad7f13567b5d2e8bc2a9c73c63e
parenta7ae93ce305c581d4129b91108c48b3624866d01 (diff)
downloadbuildstream-be5a8638264dfe6b96eabfc0e0b6582ec7091d6c.tar.gz
frontend/workspace.py: Adjust tests to new workspace format
-rw-r--r--tests/frontend/workspace.py42
1 files changed, 35 insertions, 7 deletions
diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py
index 0888d5359..8bbd516d3 100644
--- a/tests/frontend/workspace.py
+++ b/tests/frontend/workspace.py
@@ -2,6 +2,7 @@ import os
import pytest
import shutil
import subprocess
+from ruamel.yaml.comments import CommentedSet
from tests.testutils import cli, create_repo, ALL_REPO_KINDS
from buildstream import _yaml
@@ -230,7 +231,7 @@ def test_build(cli, tmpdir, datafiles, kind):
# Test loading a version with decimals
{"format-version": 0.5},
# Test loading a future version
- {"format-version": 2}
+ {"format-version": 3}
])
def test_list_unsupported_workspace(cli, tmpdir, datafiles, workspace_cfg):
project = os.path.join(datafiles.dirname, datafiles.basename)
@@ -254,10 +255,11 @@ def test_list_unsupported_workspace(cli, tmpdir, datafiles, workspace_cfg):
({
"alpha.bst": "/workspaces/bravo"
}, {
- "format-version": 1,
+ "format-version": 2,
"workspaces": {
"alpha.bst": {
- "path": "/workspaces/bravo"
+ "path": "/workspaces/bravo",
+ "running_files": {}
}
}
}),
@@ -267,10 +269,11 @@ def test_list_unsupported_workspace(cli, tmpdir, datafiles, workspace_cfg):
0: "/workspaces/bravo"
}
}, {
- "format-version": 1,
+ "format-version": 2,
"workspaces": {
"alpha.bst": {
- "path": "/workspaces/bravo"
+ "path": "/workspaces/bravo",
+ "running_files": {}
}
}
}),
@@ -283,10 +286,35 @@ def test_list_unsupported_workspace(cli, tmpdir, datafiles, workspace_cfg):
}
}
}, {
- "format-version": 1,
+ "format-version": 2,
"workspaces": {
"alpha.bst": {
- "path": "/workspaces/bravo"
+ "path": "/workspaces/bravo",
+ "running_files": {}
+ }
+ }
+ }),
+ # Test loading version 2
+ ({
+ "format-version": 2,
+ "workspaces": {
+ "alpha.bst": {
+ "path": "/workspaces/bravo",
+ "last_successful": "some_key",
+ "running_files": {
+ "beta.bst": set(["some_file"])
+ }
+ }
+ }
+ }, {
+ "format-version": 2,
+ "workspaces": {
+ "alpha.bst": {
+ "path": "/workspaces/bravo",
+ "last_successful": "some_key",
+ "running_files": {
+ "beta.bst": set(["some_file"])
+ }
}
}
})