GNOME.org
 

[Notes] [Git][BuildStream/buildstream][valentindavid/pull-chmod-bug-1.2] buildstream/_artifactcache/cascache.py: Set 0644 rights to pulled files

Title: GitLab

Valentin David pushed to branch valentindavid/pull-chmod-bug-1.2 at BuildStream / buildstream

Commits:

2 changed files:

Changes:

  • buildstream/_artifactcache/cascache.py
    ... ... @@ -854,6 +854,7 @@ class CASCache(ArtifactCache):
    854 854 
             with tempfile.NamedTemporaryFile(dir=self.tmpdir) as f:
    855 855 
                 self._fetch_blob(remote, digest, f)
    856 856
    857 
    +            os.chmod(f.name, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH)
    857 858 
                 added_digest = self.add_object(path=f.name, link_directly=True)
    858 859 
                 assert added_digest.hash == digest.hash
    859 860
    ... ... @@ -865,6 +866,7 @@ class CASCache(ArtifactCache):
    865 866 
                     f.write(data)
    866 867 
                     f.flush()
    867 868
    869 
    +                os.chmod(f.name, stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH)
    868 870 
                     added_digest = self.add_object(path=f.name, link_directly=True)
    869 871 
                     assert added_digest.hash == digest.hash
    870 872

  • tests/frontend/pull.py
    1 1 
     import os
    2 2 
     import shutil
    3 
    +import stat
    3 4 
     import pytest
    4 5 
     from tests.testutils import cli, create_artifact_share, generate_junction
    5 6
    ... ... @@ -358,3 +359,70 @@ def test_pull_missing_notifies_user(caplog, cli, tmpdir, datafiles):
    358 359
    359 360 
             assert "INFO    Remote ({}) does not have".format(share.repo) in result.stderr
    360 361 
             assert "SKIPPED Pull" in result.stderr
    362 
    +
    363 
    +
    364 
    +@pytest.mark.datafiles(DATA_DIR)
    365 
    +def test_pull_access_rights(caplog, cli, tmpdir, datafiles):
    366 
    +    project = str(datafiles)
    367 
    +    checkout = os.path.join(str(tmpdir), 'checkout')
    368 
    +
    369 
    +    # Work-around datafiles not preserving mode
    370 
    +    os.chmod(os.path.join(project, 'files/bin-files/usr/bin/hello'), 0o0755)
    371 
    +
    372 
    +    # We need a big file that does not go into a batch to test a different
    373 
    +    # code path
    374 
    +    os.makedirs(os.path.join(project, 'files/dev-files/usr/share'), exist_ok=True)
    375 
    +    with open(os.path.join(project, 'files/dev-files/usr/share/big-file'), 'w') as f:
    376 
    +        buf = ' ' * 4096
    377 
    +        for _ in range(1024):
    378 
    +            f.write(buf)
    379 
    +
    380 
    +    with create_artifact_share(os.path.join(str(tmpdir), 'artifactshare')) as share:
    381 
    +
    382 
    +        cli.configure({
    383 
    +            'artifacts': {'url': share.repo, 'push': True}
    384 
    +        })
    385 
    +        result = cli.run(project=project, args=['build', 'compose-all.bst'])
    386 
    +        result.assert_success()
    387 
    +
    388 
    +        result = cli.run(project=project,
    389 
    +                         args=['checkout', '--hardlinks', '--no-integrate',
    390 
    +                               'compose-all.bst', checkout])
    391 
    +        result.assert_success()
    392 
    +
    393 
    +        st = os.lstat(os.path.join(checkout, 'usr/include/pony.h'))
    394 
    +        assert stat.S_ISREG(st.st_mode)
    395 
    +        assert stat.S_IMODE(st.st_mode) == 0o0644
    396 
    +
    397 
    +        st = os.lstat(os.path.join(checkout, 'usr/bin/hello'))
    398 
    +        assert stat.S_ISREG(st.st_mode)
    399 
    +        assert stat.S_IMODE(st.st_mode) == 0o0755
    400 
    +
    401 
    +        st = os.lstat(os.path.join(checkout, 'usr/share/big-file'))
    402 
    +        assert stat.S_ISREG(st.st_mode)
    403 
    +        assert stat.S_IMODE(st.st_mode) == 0o0644
    404 
    +
    405 
    +        shutil.rmtree(checkout)
    406 
    +
    407 
    +        artifacts = os.path.join(cli.directory, 'artifacts')
    408 
    +        shutil.rmtree(artifacts)
    409 
    +
    410 
    +        result = cli.run(project=project, args=['pull', 'compose-all.bst'])
    411 
    +        result.assert_success()
    412 
    +
    413 
    +        result = cli.run(project=project,
    414 
    +                         args=['checkout', '--hardlinks', '--no-integrate',
    415 
    +                               'compose-all.bst', checkout])
    416 
    +        result.assert_success()
    417 
    +
    418 
    +        st = os.lstat(os.path.join(checkout, 'usr/include/pony.h'))
    419 
    +        assert stat.S_ISREG(st.st_mode)
    420 
    +        assert stat.S_IMODE(st.st_mode) == 0o0644
    421 
    +
    422 
    +        st = os.lstat(os.path.join(checkout, 'usr/bin/hello'))
    423 
    +        assert stat.S_ISREG(st.st_mode)
    424 
    +        assert stat.S_IMODE(st.st_mode) == 0o0755
    425 
    +
    426 
    +        st = os.lstat(os.path.join(checkout, 'usr/share/big-file'))
    427 
    +        assert stat.S_ISREG(st.st_mode)
    428 
    +        assert stat.S_IMODE(st.st_mode) == 0o0644

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.

    [Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]