Commit bb0c1947 authored by Tiago Gomes's avatar Tiago Gomes
Browse files

project: validate project paths (element-path)

parent c7430b01

buildstream/_project.py

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#

#  Authors:

#        Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>

#        Tiago Gomes <tiago.gomes@codethink.co.uk>



import os

import multiprocessing  # for cpu_count()
@@ -291,7 +292,8 @@ class Project(): 


        self.element_path = os.path.join(

            self.directory,

            _yaml.node_get(config, str, 'element-path')

            _yaml.node_get_project_path(config, 'element-path', self.directory,

                                        False, True)

        )



        # Load project options

tests/artifactcache/expiry.py

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ def test_never_delete_dependencies(cli, datafiles, tmpdir): 
@pytest.mark.datafiles(DATA_DIR)

def test_invalid_cache_quota(cli, datafiles, tmpdir, quota, success):

    project = os.path.join(datafiles.dirname, datafiles.basename)

    element_path = os.path.join(project, 'elements')

    os.makedirs(os.path.join(project, 'elements'))



    cli.configure({

        'cache': {