Merge branch 'traveltissues/1182' into 'master'

Remove `commit`ting sources inside `Source()._generate_key`

Closes #1182

See merge request BuildStream/buildstream!1686

2 files changed, 5 insertions, 2 deletions

diff --git a/tests/integration/shell.py b/tests/integration/shell.py
index a44f51609..49e9a5950 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -320,6 +320,10 @@ def test_workspace_visible(cli, datafiles):
     # that we got the same content here
     #
     result = cli.run(project=project, args=[
+        'source', 'fetch', element_name])
+    assert result.exit_code == 0
+
+    result = cli.run(project=project, args=[
         'shell', '--build', element_name, '--', 'cat', 'hello.c'
     ])
     assert result.exit_code == 0
diff --git a/tests/sourcecache/staging.py b/tests/sourcecache/staging.py
index b0cc03119..186a4bd9f 100644
--- a/tests/sourcecache/staging.py
+++ b/tests/sourcecache/staging.py
@@ -138,8 +138,7 @@ def test_staged_source_build(tmpdir, datafiles, cli):
         element = project.load_elements(["import-dev.bst"])[0]
 
         # check consistency of the source
-        # local sources set BST_KEY_REQUIRES_STAGE so this is cached
-        assert element._source_cached()
+        assert not element._source_cached()
 
     res = cli.run(project=project_dir, args=['build', 'target.bst'])
     res.assert_success()