summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarius Makovsky <traveltissues@protonmail.com>2019-09-26 17:35:23 +0100
committerDarius Makovsky <traveltissues@protonmail.com>2019-09-26 17:35:23 +0100
commita960191bf8457e99b658e129091209cb076e9bd9 (patch)
treee5f888d015f3eb097850b7b6e78d7dc620528e60
parent98e8ff24ea6de18c3f35207be6bbfd444bf33410 (diff)
downloadbuildstream-traveltissues/1143.tar.gz
We may want to actually start pushing from taintedtraveltissues/1143
-rw-r--r--src/buildstream/element.py4
-rw-r--r--tests/frontend/workspace.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index 5d890b017..adca9d360 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -1301,7 +1301,7 @@ class Element(Plugin):
print(self.__artifact, file=sys.stderr)
if not self._cached():
print("!!!!UNSTABLE", file=sys.stderr)
- self.__reset_cache_data()
+ #self.__reset_cache_data()
if not self.__assemble_scheduled:
self._schedule_assemble()
@@ -1945,7 +1945,7 @@ class Element(Plugin):
def _push(self):
self.__assert_cached()
- if self.__get_tainted():
+ if self.__get_tainted(True):
self.warn("Not pushing tainted artifact.")
return False
diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py
index a49762cae..2bd7eec7a 100644
--- a/tests/frontend/workspace.py
+++ b/tests/frontend/workspace.py
@@ -674,7 +674,7 @@ def test_build(cli, tmpdir_factory, datafiles, kind, strict, from_workspace, gue
# Build modified workspace
assert cli.get_element_state(project, element_name) == 'buildable'
- assert cli.get_element_key(project, element_name) == "{:?<64}".format('')
+ assert cli.get_element_key(project, element_name) != "{:?<64}".format('')
result = cli.run(project=project, args=args_dir + ['build', *args_elm])
result.assert_success()
assert cli.get_element_state(project, element_name) == 'cached'