Tristan Van Berkom pushed to branch master at BuildStream / buildstream
Commits:
-
c5778941
by Josh Smith at 2018-10-04T13:43:10Z
-
788cde6a
by Josh Smith at 2018-10-04T13:43:10Z
-
8630bac4
by Tristan Van Berkom at 2018-10-04T14:11:27Z
2 changed files:
Changes:
| ... | ... | @@ -212,7 +212,7 @@ class Element(Plugin): |
| 212 | 212 |
self.__staged_sources_directory = None # Location where Element.stage_sources() was called
|
| 213 | 213 |
self.__tainted = None # Whether the artifact is tainted and should not be shared
|
| 214 | 214 |
self.__required = False # Whether the artifact is required in the current session
|
| 215 |
- self.__build_result = None # The result of assembling this Element
|
|
| 215 |
+ self.__build_result = None # The result of assembling this Element (success, description, detail)
|
|
| 216 | 216 |
self._build_log_path = None # The path of the build log for this Element
|
| 217 | 217 |
|
| 218 | 218 |
# hash tables of loaded artifact metadata, hashed by key
|
| ... | ... | @@ -1479,11 +1479,13 @@ class Element(Plugin): |
| 1479 | 1479 |
|
| 1480 | 1480 |
self._update_state()
|
| 1481 | 1481 |
|
| 1482 |
- if self._get_workspace() and self._cached():
|
|
| 1482 |
+ if self._get_workspace() and self._cached_success():
|
|
| 1483 |
+ assert utils._is_main_process(), \
|
|
| 1484 |
+ "Attempted to save workspace configuration from child process"
|
|
| 1483 | 1485 |
#
|
| 1484 | 1486 |
# Note that this block can only happen in the
|
| 1485 |
- # main process, since `self._cached()` cannot
|
|
| 1486 |
- # be true when assembly is completed in the task.
|
|
| 1487 |
+ # main process, since `self._cached_success()` cannot
|
|
| 1488 |
+ # be true when assembly is successful in the task.
|
|
| 1487 | 1489 |
#
|
| 1488 | 1490 |
# For this reason, it is safe to update and
|
| 1489 | 1491 |
# save the workspaces configuration
|
| ... | ... | @@ -43,7 +43,8 @@ DATA_DIR = os.path.join( |
| 43 | 43 |
)
|
| 44 | 44 |
|
| 45 | 45 |
|
| 46 |
-def open_workspace(cli, tmpdir, datafiles, kind, track, suffix='', workspace_dir=None, project_path=None):
|
|
| 46 |
+def open_workspace(cli, tmpdir, datafiles, kind, track, suffix='', workspace_dir=None,
|
|
| 47 |
+ project_path=None, element_attrs=None):
|
|
| 47 | 48 |
if not workspace_dir:
|
| 48 | 49 |
workspace_dir = os.path.join(str(tmpdir), 'workspace{}'.format(suffix))
|
| 49 | 50 |
if not project_path:
|
| ... | ... | @@ -69,6 +70,8 @@ def open_workspace(cli, tmpdir, datafiles, kind, track, suffix='', workspace_dir |
| 69 | 70 |
repo.source_config(ref=ref)
|
| 70 | 71 |
]
|
| 71 | 72 |
}
|
| 73 |
+ if element_attrs:
|
|
| 74 |
+ element = {**element, **element_attrs}
|
|
| 72 | 75 |
_yaml.dump(element,
|
| 73 | 76 |
os.path.join(element_path,
|
| 74 | 77 |
element_name))
|
| ... | ... | @@ -854,3 +857,22 @@ def test_cache_key_workspace_in_dependencies(cli, tmpdir, datafiles, strict): |
| 854 | 857 |
|
| 855 | 858 |
# Check that the original /usr/bin/hello is not in the checkout
|
| 856 | 859 |
assert not os.path.exists(os.path.join(checkout, 'usr', 'bin', 'hello'))
|
| 860 |
+ |
|
| 861 |
+ |
|
| 862 |
+@pytest.mark.datafiles(DATA_DIR)
|
|
| 863 |
+def test_multiple_failed_builds(cli, tmpdir, datafiles):
|
|
| 864 |
+ element_config = {
|
|
| 865 |
+ "kind": "manual",
|
|
| 866 |
+ "config": {
|
|
| 867 |
+ "configure-commands": [
|
|
| 868 |
+ "unknown_command_that_will_fail"
|
|
| 869 |
+ ]
|
|
| 870 |
+ }
|
|
| 871 |
+ }
|
|
| 872 |
+ element_name, project, _ = open_workspace(cli, tmpdir, datafiles,
|
|
| 873 |
+ "git", False, element_attrs=element_config)
|
|
| 874 |
+ |
|
| 875 |
+ for _ in range(2):
|
|
| 876 |
+ result = cli.run(project=project, args=["build", element_name])
|
|
| 877 |
+ assert "BUG" not in result.stderr
|
|
| 878 |
+ assert cli.get_element_state(project, element_name) != "cached"
|