summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2018-07-31 12:39:17 +0100
committerTiago Gomes <tiago.avv@gmail.com>2018-08-02 11:24:43 +0000
commit33292be4618b83147258e729a44caa58859e4ba2 (patch)
tree9af95e3e64eb4b6818b1b7d40f17dc94d2caaf52 /tests
parente788bda4969de17178f3facc0d31b36c91121402 (diff)
downloadbuildstream-33292be4618b83147258e729a44caa58859e4ba2.tar.gz
local plugin: validate project paths
The autotools example had to be copied over inside of the junction example, as referring to a path outside of the project directory is now disallowed.
Diffstat (limited to 'tests')
-rw-r--r--tests/artifactcache/expiry.py67
-rw-r--r--tests/examples/junctions.py32
-rw-r--r--tests/frontend/push.py22
-rw-r--r--tests/sources/local.py6
-rw-r--r--tests/testutils/element_generators.py11
5 files changed, 46 insertions, 92 deletions
diff --git a/tests/artifactcache/expiry.py b/tests/artifactcache/expiry.py
index 4c741054b..62c066605 100644
--- a/tests/artifactcache/expiry.py
+++ b/tests/artifactcache/expiry.py
@@ -5,7 +5,7 @@ import pytest
from buildstream import _yaml
from buildstream._exceptions import ErrorDomain, LoadErrorReason
-from tests.testutils import cli
+from tests.testutils import cli, create_element_size
DATA_DIR = os.path.join(
@@ -14,32 +14,12 @@ DATA_DIR = os.path.join(
)
-def create_element(name, path, dependencies, size):
- os.makedirs(path, exist_ok=True)
-
- # Create a file to be included in this element's artifact
- with open(os.path.join(path, name + '_data'), 'wb+') as f:
- f.write(os.urandom(size))
-
- element = {
- 'kind': 'import',
- 'sources': [
- {
- 'kind': 'local',
- 'path': os.path.join(path, name + '_data')
- }
- ],
- 'depends': dependencies
- }
- _yaml.dump(element, os.path.join(path, name))
-
-
# Ensure that the cache successfully removes an old artifact if we do
# not have enough space left.
@pytest.mark.datafiles(DATA_DIR)
def test_artifact_expires(cli, datafiles, tmpdir):
project = os.path.join(datafiles.dirname, datafiles.basename)
- element_path = os.path.join(project, 'elements')
+ element_path = 'elements'
cache_location = os.path.join(project, 'cache', 'artifacts', 'ostree')
checkout = os.path.join(project, 'checkout')
@@ -52,7 +32,7 @@ def test_artifact_expires(cli, datafiles, tmpdir):
# Create an element that uses almost the entire cache (an empty
# ostree cache starts at about ~10KiB, so we need a bit of a
# buffer)
- create_element('target.bst', element_path, [], 6000000)
+ create_element_size('target.bst', project, element_path, [], 6000000)
res = cli.run(project=project, args=['build', 'target.bst'])
res.assert_success()
@@ -61,7 +41,7 @@ def test_artifact_expires(cli, datafiles, tmpdir):
# Our cache should now be almost full. Let's create another
# artifact and see if we can cause buildstream to delete the old
# one.
- create_element('target2.bst', element_path, [], 6000000)
+ create_element_size('target2.bst', project, element_path, [], 6000000)
res = cli.run(project=project, args=['build', 'target2.bst'])
res.assert_success()
@@ -82,7 +62,7 @@ def test_artifact_expires(cli, datafiles, tmpdir):
@pytest.mark.datafiles(DATA_DIR)
def test_artifact_too_large(cli, datafiles, tmpdir, size):
project = os.path.join(datafiles.dirname, datafiles.basename)
- element_path = os.path.join(project, 'elements')
+ element_path = 'elements'
cli.configure({
'cache': {
@@ -91,7 +71,7 @@ def test_artifact_too_large(cli, datafiles, tmpdir, size):
})
# Create an element whose artifact is too large
- create_element('target.bst', element_path, [], size)
+ create_element_size('target.bst', project, element_path, [], size)
res = cli.run(project=project, args=['build', 'target.bst'])
res.assert_main_error(ErrorDomain.STREAM, None)
@@ -99,7 +79,7 @@ def test_artifact_too_large(cli, datafiles, tmpdir, size):
@pytest.mark.datafiles(DATA_DIR)
def test_expiry_order(cli, datafiles, tmpdir):
project = os.path.join(datafiles.dirname, datafiles.basename)
- element_path = os.path.join(project, 'elements')
+ element_path = 'elements'
cache_location = os.path.join(project, 'cache', 'artifacts', 'ostree')
checkout = os.path.join(project, 'workspace')
@@ -110,21 +90,21 @@ def test_expiry_order(cli, datafiles, tmpdir):
})
# Create an artifact
- create_element('dep.bst', element_path, [], 2000000)
+ create_element_size('dep.bst', project, element_path, [], 2000000)
res = cli.run(project=project, args=['build', 'dep.bst'])
res.assert_success()
# Create another artifact
- create_element('unrelated.bst', element_path, [], 2000000)
+ create_element_size('unrelated.bst', project, element_path, [], 2000000)
res = cli.run(project=project, args=['build', 'unrelated.bst'])
res.assert_success()
# And build something else
- create_element('target.bst', element_path, [], 2000000)
+ create_element_size('target.bst', project, element_path, [], 2000000)
res = cli.run(project=project, args=['build', 'target.bst'])
res.assert_success()
- create_element('target2.bst', element_path, [], 2000000)
+ create_element_size('target2.bst', project, element_path, [], 2000000)
res = cli.run(project=project, args=['build', 'target2.bst'])
res.assert_success()
@@ -133,7 +113,7 @@ def test_expiry_order(cli, datafiles, tmpdir):
res.assert_success()
# Finally, build something that will cause the cache to overflow
- create_element('expire.bst', element_path, [], 2000000)
+ create_element_size('expire.bst', project, element_path, [], 2000000)
res = cli.run(project=project, args=['build', 'expire.bst'])
res.assert_success()
@@ -153,7 +133,7 @@ def test_expiry_order(cli, datafiles, tmpdir):
@pytest.mark.datafiles(DATA_DIR)
def test_keep_dependencies(cli, datafiles, tmpdir):
project = os.path.join(datafiles.dirname, datafiles.basename)
- element_path = os.path.join(project, 'elements')
+ element_path = 'elements'
cache_location = os.path.join(project, 'cache', 'artifacts', 'ostree')
cli.configure({
@@ -163,12 +143,12 @@ def test_keep_dependencies(cli, datafiles, tmpdir):
})
# Create a pretty big dependency
- create_element('dependency.bst', element_path, [], 5000000)
+ create_element_size('dependency.bst', project, element_path, [], 5000000)
res = cli.run(project=project, args=['build', 'dependency.bst'])
res.assert_success()
# Now create some other unrelated artifact
- create_element('unrelated.bst', element_path, [], 4000000)
+ create_element_size('unrelated.bst', project, element_path, [], 4000000)
res = cli.run(project=project, args=['build', 'unrelated.bst'])
res.assert_success()
@@ -184,7 +164,8 @@ def test_keep_dependencies(cli, datafiles, tmpdir):
# duplicating artifacts (bad!) we need to make this equal in size
# or smaller than half the size of its dependencies.
#
- create_element('target.bst', element_path, ['dependency.bst'], 2000000)
+ create_element_size('target.bst', project,
+ element_path, ['dependency.bst'], 2000000)
res = cli.run(project=project, args=['build', 'target.bst'])
res.assert_success()
@@ -197,7 +178,7 @@ def test_keep_dependencies(cli, datafiles, tmpdir):
@pytest.mark.datafiles(DATA_DIR)
def test_never_delete_dependencies(cli, datafiles, tmpdir):
project = os.path.join(datafiles.dirname, datafiles.basename)
- element_path = os.path.join(project, 'elements')
+ element_path = 'elements'
cli.configure({
'cache': {
@@ -206,10 +187,14 @@ def test_never_delete_dependencies(cli, datafiles, tmpdir):
})
# Create a build tree
- create_element('dependency.bst', element_path, [], 8000000)
- create_element('related.bst', element_path, ['dependency.bst'], 8000000)
- create_element('target.bst', element_path, ['related.bst'], 8000000)
- create_element('target2.bst', element_path, ['target.bst'], 8000000)
+ create_element_size('dependency.bst', project,
+ element_path, [], 8000000)
+ create_element_size('related.bst', project,
+ element_path, ['dependency.bst'], 8000000)
+ create_element_size('target.bst', project,
+ element_path, ['related.bst'], 8000000)
+ create_element_size('target2.bst', project,
+ element_path, ['target.bst'], 8000000)
# We try to build this pipeline, but it's too big for the
# cache. Since all elements are required, the build should fail.
diff --git a/tests/examples/junctions.py b/tests/examples/junctions.py
index 49e2ebbff..d2a653884 100644
--- a/tests/examples/junctions.py
+++ b/tests/examples/junctions.py
@@ -11,42 +11,12 @@ DATA_DIR = os.path.join(
os.path.dirname(os.path.realpath(__file__)), '..', '..', 'doc', 'examples', 'junctions'
)
-JUNCTION_IMPORT_PATH = os.path.join(
- os.path.dirname(os.path.realpath(__file__)), '..', '..', 'doc', 'examples', 'autotools'
-)
-
-
-def ammend_juntion_path_paths(tmpdir):
- # The junction element in the examples/junctions project uses a local source type.
- # It's "path:" must specify a relative path from the project's root directory.
- # For the hello-junction element to function during these tests, the copy of the junctions
- # project made in the buildstream/tmp/directory, "path:" must be ammended to be the relative
- # path to the autotools example from the temporary test directory.
- junction_element = os.path.join(tmpdir, "elements", "hello-junction.bst")
- junction_element_bst = ""
- junction_relative_path = os.path.relpath(JUNCTION_IMPORT_PATH, tmpdir)
- with open(junction_element, 'r') as f:
- junction_element_bst = f.read()
- ammended_element_bst = junction_element_bst.replace("../autotools", junction_relative_path)
- with open(junction_element, 'w') as f:
- f.write(ammended_element_bst)
-
-
-# Check that the autotools project is where the junctions example expects and
-# contains the hello.bst element.
-@pytest.mark.datafiles(DATA_DIR)
-def test_autotools_example_is_present(datafiles):
- autotools_path = JUNCTION_IMPORT_PATH
- assert os.path.exists(autotools_path)
- assert os.path.exists(os.path.join(autotools_path, "elements", "hello.bst"))
-
# Test that the project builds successfully
@pytest.mark.skipif(not IS_LINUX, reason='Only available on linux')
@pytest.mark.datafiles(DATA_DIR)
def test_build(cli, tmpdir, datafiles):
project = os.path.join(datafiles.dirname, datafiles.basename)
- ammend_juntion_path_paths(str(tmpdir))
result = cli.run(project=project, args=['build', 'callHello.bst'])
result.assert_success()
@@ -57,7 +27,6 @@ def test_build(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
def test_shell_call_hello(cli, tmpdir, datafiles):
project = os.path.join(datafiles.dirname, datafiles.basename)
- ammend_juntion_path_paths(str(tmpdir))
result = cli.run(project=project, args=['build', 'callHello.bst'])
result.assert_success()
@@ -73,7 +42,6 @@ def test_shell_call_hello(cli, tmpdir, datafiles):
def test_open_cross_junction_workspace(cli, tmpdir, datafiles):
project = os.path.join(datafiles.dirname, datafiles.basename)
workspace_dir = os.path.join(str(tmpdir), "workspace_hello_junction")
- ammend_juntion_path_paths(str(tmpdir))
result = cli.run(project=project,
args=['workspace', 'open', 'hello-junction.bst:hello.bst', workspace_dir])
diff --git a/tests/frontend/push.py b/tests/frontend/push.py
index 471991ef7..be324ca53 100644
--- a/tests/frontend/push.py
+++ b/tests/frontend/push.py
@@ -202,7 +202,7 @@ def test_push_after_pull(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
def test_artifact_expires(cli, datafiles, tmpdir):
project = os.path.join(datafiles.dirname, datafiles.basename)
- element_path = os.path.join(project, 'elements')
+ element_path = 'elements'
# Create an artifact share (remote artifact cache) in the tmpdir/artifactshare
# Mock a file system with 12 MB free disk space
@@ -215,12 +215,12 @@ def test_artifact_expires(cli, datafiles, tmpdir):
})
# Create and build an element of 5 MB
- create_element_size('element1.bst', element_path, [], int(5e6)) # [] => no deps
+ create_element_size('element1.bst', project, element_path, [], int(5e6))
result = cli.run(project=project, args=['build', 'element1.bst'])
result.assert_success()
# Create and build an element of 5 MB
- create_element_size('element2.bst', element_path, [], int(5e6)) # [] => no deps
+ create_element_size('element2.bst', project, element_path, [], int(5e6))
result = cli.run(project=project, args=['build', 'element2.bst'])
result.assert_success()
@@ -231,7 +231,7 @@ def test_artifact_expires(cli, datafiles, tmpdir):
assert_shared(cli, share, project, 'element2.bst')
# Create and build another element of 5 MB (This will exceed the free disk space available)
- create_element_size('element3.bst', element_path, [], int(5e6))
+ create_element_size('element3.bst', project, element_path, [], int(5e6))
result = cli.run(project=project, args=['build', 'element3.bst'])
result.assert_success()
@@ -250,7 +250,7 @@ def test_artifact_expires(cli, datafiles, tmpdir):
@pytest.mark.datafiles(DATA_DIR)
def test_artifact_too_large(cli, datafiles, tmpdir):
project = os.path.join(datafiles.dirname, datafiles.basename)
- element_path = os.path.join(project, 'elements')
+ element_path = 'elements'
# Create an artifact share (remote cache) in tmpdir/artifactshare
# Mock a file system with 5 MB total space
@@ -263,12 +263,12 @@ def test_artifact_too_large(cli, datafiles, tmpdir):
})
# Create and push a 3MB element
- create_element_size('small_element.bst', element_path, [], int(3e6))
+ create_element_size('small_element.bst', project, element_path, [], int(3e6))
result = cli.run(project=project, args=['build', 'small_element.bst'])
result.assert_success()
# Create and try to push a 6MB element.
- create_element_size('large_element.bst', element_path, [], int(6e6))
+ create_element_size('large_element.bst', project, element_path, [], int(6e6))
result = cli.run(project=project, args=['build', 'large_element.bst'])
result.assert_success()
@@ -285,7 +285,7 @@ def test_artifact_too_large(cli, datafiles, tmpdir):
@pytest.mark.datafiles(DATA_DIR)
def test_recently_pulled_artifact_does_not_expire(cli, datafiles, tmpdir):
project = os.path.join(datafiles.dirname, datafiles.basename)
- element_path = os.path.join(project, 'elements')
+ element_path = 'elements'
# Create an artifact share (remote cache) in tmpdir/artifactshare
# Mock a file system with 12 MB free disk space
@@ -298,11 +298,11 @@ def test_recently_pulled_artifact_does_not_expire(cli, datafiles, tmpdir):
})
# Create and build 2 elements, each of 5 MB.
- create_element_size('element1.bst', element_path, [], int(5e6))
+ create_element_size('element1.bst', project, element_path, [], int(5e6))
result = cli.run(project=project, args=['build', 'element1.bst'])
result.assert_success()
- create_element_size('element2.bst', element_path, [], int(5e6))
+ create_element_size('element2.bst', project, element_path, [], int(5e6))
result = cli.run(project=project, args=['build', 'element2.bst'])
result.assert_success()
@@ -327,7 +327,7 @@ def test_recently_pulled_artifact_does_not_expire(cli, datafiles, tmpdir):
assert cli.get_element_state(project, 'element1.bst') == 'cached'
# Create and build the element3 (of 5 MB)
- create_element_size('element3.bst', element_path, [], int(5e6))
+ create_element_size('element3.bst', project, element_path, [], int(5e6))
result = cli.run(project=project, args=['build', 'element3.bst'])
result.assert_success()
diff --git a/tests/sources/local.py b/tests/sources/local.py
index 9dfb5f972..8d2307e27 100644
--- a/tests/sources/local.py
+++ b/tests/sources/local.py
@@ -1,7 +1,7 @@
import os
import pytest
-from buildstream._exceptions import ErrorDomain
+from buildstream._exceptions import ErrorDomain, LoadErrorReason
from tests.testutils import cli
DATA_DIR = os.path.join(
@@ -15,13 +15,13 @@ def test_missing_file(cli, tmpdir, datafiles):
project = os.path.join(datafiles.dirname, datafiles.basename)
# Removing the local file causes preflight to fail
- localfile = os.path.join(datafiles.dirname, datafiles.basename, 'file.txt')
+ localfile = os.path.join(project, 'file.txt')
os.remove(localfile)
result = cli.run(project=project, args=[
'show', 'target.bst'
])
- result.assert_main_error(ErrorDomain.SOURCE, None)
+ result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.MISSING_FILE)
@pytest.mark.datafiles(os.path.join(DATA_DIR, 'basic'))
diff --git a/tests/testutils/element_generators.py b/tests/testutils/element_generators.py
index 3f6090da8..49f235c61 100644
--- a/tests/testutils/element_generators.py
+++ b/tests/testutils/element_generators.py
@@ -18,11 +18,12 @@ from buildstream import _yaml
# Returns:
# Nothing (creates a .bst file of specified size)
#
-def create_element_size(name, path, dependencies, size):
- os.makedirs(path, exist_ok=True)
+def create_element_size(name, project_dir, elements_path, dependencies, size):
+ full_elements_path = os.path.join(project_dir, elements_path)
+ os.makedirs(full_elements_path, exist_ok=True)
# Create a file to be included in this element's artifact
- with open(os.path.join(path, name + '_data'), 'wb+') as f:
+ with open(os.path.join(project_dir, name + '_data'), 'wb+') as f:
f.write(os.urandom(size))
# Simplest case: We want this file (of specified size) to just
@@ -32,9 +33,9 @@ def create_element_size(name, path, dependencies, size):
'sources': [
{
'kind': 'local',
- 'path': os.path.join(path, name + '_data')
+ 'path': name + '_data'
}
],
'depends': dependencies
}
- _yaml.dump(element, os.path.join(path, name))
+ _yaml.dump(element, os.path.join(project_dir, elements_path, name))