You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by tv...@apache.org on 2022/03/26 06:57:16 UTC
[buildstream] branch tristan/remove-sip-zource created (now bd2004e)
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a change to branch tristan/remove-sip-zource
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
at bd2004e plugins/sources/zip.py: Removing zip source
This branch includes the following new commits:
new 1c3466f tests/testutils/repo/zip.py: Removing Zip test repo scaffold
new eda8cef tests/sources/zip.py: Removing zip tests
new bcdb885 tests/cachekey: Removing zip sources from the cache key tests
new bd2004e plugins/sources/zip.py: Removing zip source
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[buildstream] 01/04: tests/testutils/repo/zip.py: Removing Zip test repo scaffold
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch tristan/remove-sip-zource
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 1c3466f2e698c381bbe8d8cd6edbb05036d448b5
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Sat Mar 26 15:14:33 2022 +0900
tests/testutils/repo/zip.py: Removing Zip test repo scaffold
---
tests/conftest.py | 2 --
tests/testutils/repo/zip.py | 33 ---------------------------------
2 files changed, 35 deletions(-)
diff --git a/tests/conftest.py b/tests/conftest.py
index f58f419..168a8ca 100755
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -34,7 +34,6 @@ from buildstream._testing.integration import integration_cache # pylint: disabl
from tests.testutils.repo.git import Git
from tests.testutils.repo.bzr import Bzr
from tests.testutils.repo.tar import Tar
-from tests.testutils.repo.zip import Zip
#
@@ -133,7 +132,6 @@ def remote_services(request):
register_repo_kind("git", Git, None)
register_repo_kind("bzr", Bzr, None)
register_repo_kind("tar", Tar, None)
-register_repo_kind("zip", Zip, None)
# This hook enables pytest to collect the templated source tests from
diff --git a/tests/testutils/repo/zip.py b/tests/testutils/repo/zip.py
deleted file mode 100644
index d2f8d9b..0000000
--- a/tests/testutils/repo/zip.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import os
-import zipfile
-
-from buildstream.utils import sha256sum
-
-from buildstream._testing import Repo
-
-
-class Zip(Repo):
- def create(self, directory):
- archive = os.path.join(self.repo, "file.zip")
-
- old_dir = os.getcwd()
- os.chdir(directory)
- with zipfile.ZipFile(archive, "w") as zipfp:
- for root, dirs, files in os.walk("."):
- names = dirs + files
- names = [os.path.join(root, name) for name in names]
-
- for name in names:
- zipfp.write(name)
-
- os.chdir(old_dir)
-
- return sha256sum(archive)
-
- def source_config(self, ref=None):
- archive = os.path.join(self.repo, "file.zip")
- config = {"kind": "zip", "url": "file://" + archive, "directory": "", "base-dir": ""}
- if ref is not None:
- config["ref"] = ref
-
- return config
[buildstream] 02/04: tests/sources/zip.py: Removing zip tests
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch tristan/remove-sip-zource
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit eda8cef99525f8fa6900142079c3375005d0196a
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Sat Mar 26 15:17:56 2022 +0900
tests/sources/zip.py: Removing zip tests
---
tests/sources/zip.py | 205 -----------------------
tests/sources/zip/explicit-basedir/content/a/b/d | 1 -
tests/sources/zip/explicit-basedir/content/a/c | 1 -
tests/sources/zip/explicit-basedir/target.bst | 7 -
tests/sources/zip/fetch/content/a/b/d | 1 -
tests/sources/zip/fetch/content/a/c | 1 -
tests/sources/zip/fetch/target.bst | 6 -
tests/sources/zip/no-basedir/content/a/b/d | 1 -
tests/sources/zip/no-basedir/content/a/c | 1 -
tests/sources/zip/no-basedir/target.bst | 7 -
tests/sources/zip/no-ref/a/b/d | 1 -
tests/sources/zip/no-ref/a/c | 1 -
tests/sources/zip/no-ref/target.bst | 5 -
13 files changed, 238 deletions(-)
diff --git a/tests/sources/zip.py b/tests/sources/zip.py
deleted file mode 100644
index 7569c2a..0000000
--- a/tests/sources/zip.py
+++ /dev/null
@@ -1,205 +0,0 @@
-# Pylint doesn't play well with fixtures and dependency injection from pytest
-# pylint: disable=redefined-outer-name
-
-import os
-import zipfile
-
-import pytest
-
-from buildstream.exceptions import ErrorDomain
-from buildstream._testing import generate_project
-from buildstream._testing import cli # pylint: disable=unused-import
-from tests.testutils.file_server import create_file_server
-from . import list_dir_contents
-
-DATA_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "zip",)
-
-
-def _assemble_zip(workingdir, dstfile):
- old_dir = os.getcwd()
- os.chdir(workingdir)
- with zipfile.ZipFile(dstfile, "w") as zipfp:
- for root, dirs, files in os.walk("."):
- names = dirs + files
- names = [os.path.join(root, name) for name in names]
- for name in names:
- zipfp.write(name)
- os.chdir(old_dir)
-
-
-# Test that without ref, consistency is set appropriately.
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "no-ref"))
-def test_no_ref(cli, tmpdir, datafiles):
- project = str(datafiles)
- generate_project(project, config={"aliases": {"tmpdir": "file:///" + str(tmpdir)}})
- assert cli.get_element_state(project, "target.bst") == "no reference"
-
-
-# Test that when I fetch a nonexistent URL, errors are handled gracefully and a retry is performed.
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "fetch"))
-def test_fetch_bad_url(cli, tmpdir, datafiles):
- project = str(datafiles)
- generate_project(project, config={"aliases": {"tmpdir": "file:///" + str(tmpdir)}})
-
- # Try to fetch it
- result = cli.run(project=project, args=["source", "fetch", "target.bst"])
- assert "FAILURE Try #" in result.stderr
- result.assert_main_error(ErrorDomain.STREAM, None)
- result.assert_task_error(ErrorDomain.SOURCE, None)
-
-
-# Test that when I fetch with an invalid ref, it fails.
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "fetch"))
-def test_fetch_bad_ref(cli, tmpdir, datafiles):
- project = str(datafiles)
- generate_project(project, config={"aliases": {"tmpdir": "file:///" + str(tmpdir)}})
-
- # Create a local tar
- src_zip = os.path.join(str(tmpdir), "a.zip")
- _assemble_zip(os.path.join(str(datafiles), "content"), src_zip)
-
- # Try to fetch it
- result = cli.run(project=project, args=["source", "fetch", "target.bst"])
- result.assert_main_error(ErrorDomain.STREAM, None)
- result.assert_task_error(ErrorDomain.SOURCE, None)
-
-
-# Test that when tracking with a ref set, there is a warning
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "fetch"))
-def test_track_warning(cli, tmpdir, datafiles):
- project = str(datafiles)
- generate_project(project, config={"aliases": {"tmpdir": "file:///" + str(tmpdir)}})
-
- # Create a local tar
- src_zip = os.path.join(str(tmpdir), "a.zip")
- _assemble_zip(os.path.join(str(datafiles), "content"), src_zip)
-
- # Track it
- result = cli.run(project=project, args=["source", "track", "target.bst"])
- result.assert_success()
- assert "Potential man-in-the-middle attack!" in result.stderr
-
-
-# Test that a staged checkout matches what was tarred up, with the default first subdir
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "fetch"))
-def test_stage_default_basedir(cli, tmpdir, datafiles):
- project = str(datafiles)
- generate_project(project, config={"aliases": {"tmpdir": "file:///" + str(tmpdir)}})
- checkoutdir = os.path.join(str(tmpdir), "checkout")
-
- # Create a local tar
- src_zip = os.path.join(str(tmpdir), "a.zip")
- _assemble_zip(os.path.join(str(datafiles), "content"), src_zip)
-
- # Track, fetch, build, checkout
- result = cli.run(project=project, args=["source", "track", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["source", "fetch", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["build", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["artifact", "checkout", "target.bst", "--directory", checkoutdir])
- result.assert_success()
-
- # Check that the content of the first directory is checked out (base-dir: '*')
- original_dir = os.path.join(str(datafiles), "content", "a")
- original_contents = list_dir_contents(original_dir)
- checkout_contents = list_dir_contents(checkoutdir)
- assert checkout_contents == original_contents
-
-
-# Test that a staged checkout matches what was tarred up, with an empty base-dir
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "no-basedir"))
-def test_stage_no_basedir(cli, tmpdir, datafiles):
- project = str(datafiles)
- generate_project(project, config={"aliases": {"tmpdir": "file:///" + str(tmpdir)}})
- checkoutdir = os.path.join(str(tmpdir), "checkout")
-
- # Create a local tar
- src_zip = os.path.join(str(tmpdir), "a.zip")
- _assemble_zip(os.path.join(str(datafiles), "content"), src_zip)
-
- # Track, fetch, build, checkout
- result = cli.run(project=project, args=["source", "track", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["source", "fetch", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["build", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["artifact", "checkout", "target.bst", "--directory", checkoutdir])
- result.assert_success()
-
- # Check that the full content of the tarball is checked out (base-dir: '')
- original_dir = os.path.join(str(datafiles), "content")
- original_contents = list_dir_contents(original_dir)
- checkout_contents = list_dir_contents(checkoutdir)
- assert checkout_contents == original_contents
-
-
-# Test that a staged checkout matches what was tarred up, with an explicit basedir
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "explicit-basedir"))
-def test_stage_explicit_basedir(cli, tmpdir, datafiles):
- project = str(datafiles)
- generate_project(project, config={"aliases": {"tmpdir": "file:///" + str(tmpdir)}})
- checkoutdir = os.path.join(str(tmpdir), "checkout")
-
- # Create a local tar
- src_zip = os.path.join(str(tmpdir), "a.zip")
- _assemble_zip(os.path.join(str(datafiles), "content"), src_zip)
-
- # Track, fetch, build, checkout
- result = cli.run(project=project, args=["source", "track", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["source", "fetch", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["build", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["artifact", "checkout", "target.bst", "--directory", checkoutdir])
- result.assert_success()
-
- # Check that the content of the first directory is checked out (base-dir: '*')
- original_dir = os.path.join(str(datafiles), "content", "a")
- original_contents = list_dir_contents(original_dir)
- checkout_contents = list_dir_contents(checkoutdir)
- assert checkout_contents == original_contents
-
-
-@pytest.mark.parametrize("server_type", ("FTP", "HTTP"))
-@pytest.mark.datafiles(os.path.join(DATA_DIR, "fetch"))
-def test_use_netrc(cli, datafiles, server_type, tmpdir):
- file_server_files = os.path.join(str(tmpdir), "file_server")
- fake_home = os.path.join(str(tmpdir), "fake_home")
- os.makedirs(file_server_files, exist_ok=True)
- os.makedirs(fake_home, exist_ok=True)
- project = str(datafiles)
- checkoutdir = os.path.join(str(tmpdir), "checkout")
-
- os.environ["HOME"] = fake_home
- with open(os.path.join(fake_home, ".netrc"), "wb") as f:
- os.fchmod(f.fileno(), 0o700)
- f.write(b"machine 127.0.0.1\n")
- f.write(b"login testuser\n")
- f.write(b"password 12345\n")
-
- with create_file_server(server_type) as server:
- server.add_user("testuser", "12345", file_server_files)
- generate_project(project, config={"aliases": {"tmpdir": server.base_url()}})
-
- src_zip = os.path.join(file_server_files, "a.zip")
- _assemble_zip(os.path.join(str(datafiles), "content"), src_zip)
-
- server.start()
-
- result = cli.run(project=project, args=["source", "track", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["source", "fetch", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["build", "target.bst"])
- result.assert_success()
- result = cli.run(project=project, args=["artifact", "checkout", "target.bst", "--directory", checkoutdir])
- result.assert_success()
-
- original_dir = os.path.join(str(datafiles), "content", "a")
- original_contents = list_dir_contents(original_dir)
- checkout_contents = list_dir_contents(checkoutdir)
- assert checkout_contents == original_contents
diff --git a/tests/sources/zip/explicit-basedir/content/a/b/d b/tests/sources/zip/explicit-basedir/content/a/b/d
deleted file mode 100644
index 4bcfe98..0000000
--- a/tests/sources/zip/explicit-basedir/content/a/b/d
+++ /dev/null
@@ -1 +0,0 @@
-d
diff --git a/tests/sources/zip/explicit-basedir/content/a/c b/tests/sources/zip/explicit-basedir/content/a/c
deleted file mode 100644
index f2ad6c7..0000000
--- a/tests/sources/zip/explicit-basedir/content/a/c
+++ /dev/null
@@ -1 +0,0 @@
-c
diff --git a/tests/sources/zip/explicit-basedir/target.bst b/tests/sources/zip/explicit-basedir/target.bst
deleted file mode 100644
index b17cc83..0000000
--- a/tests/sources/zip/explicit-basedir/target.bst
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: import
-description: The kind of this element is irrelevant.
-sources:
-- kind: zip
- url: tmpdir:/a.zip
- ref: foo
- base-dir: 'a'
diff --git a/tests/sources/zip/fetch/content/a/b/d b/tests/sources/zip/fetch/content/a/b/d
deleted file mode 100644
index 4bcfe98..0000000
--- a/tests/sources/zip/fetch/content/a/b/d
+++ /dev/null
@@ -1 +0,0 @@
-d
diff --git a/tests/sources/zip/fetch/content/a/c b/tests/sources/zip/fetch/content/a/c
deleted file mode 100644
index f2ad6c7..0000000
--- a/tests/sources/zip/fetch/content/a/c
+++ /dev/null
@@ -1 +0,0 @@
-c
diff --git a/tests/sources/zip/fetch/target.bst b/tests/sources/zip/fetch/target.bst
deleted file mode 100644
index d0e4a5a..0000000
--- a/tests/sources/zip/fetch/target.bst
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: import
-description: The kind of this element is irrelevant.
-sources:
-- kind: zip
- url: tmpdir:/a.zip
- ref: foo
diff --git a/tests/sources/zip/no-basedir/content/a/b/d b/tests/sources/zip/no-basedir/content/a/b/d
deleted file mode 100644
index 4bcfe98..0000000
--- a/tests/sources/zip/no-basedir/content/a/b/d
+++ /dev/null
@@ -1 +0,0 @@
-d
diff --git a/tests/sources/zip/no-basedir/content/a/c b/tests/sources/zip/no-basedir/content/a/c
deleted file mode 100644
index f2ad6c7..0000000
--- a/tests/sources/zip/no-basedir/content/a/c
+++ /dev/null
@@ -1 +0,0 @@
-c
diff --git a/tests/sources/zip/no-basedir/target.bst b/tests/sources/zip/no-basedir/target.bst
deleted file mode 100644
index 103f4f8..0000000
--- a/tests/sources/zip/no-basedir/target.bst
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: import
-description: The kind of this element is irrelevant.
-sources:
-- kind: zip
- url: tmpdir:/a.zip
- ref: foo
- base-dir: ''
diff --git a/tests/sources/zip/no-ref/a/b/d b/tests/sources/zip/no-ref/a/b/d
deleted file mode 100644
index 4bcfe98..0000000
--- a/tests/sources/zip/no-ref/a/b/d
+++ /dev/null
@@ -1 +0,0 @@
-d
diff --git a/tests/sources/zip/no-ref/a/c b/tests/sources/zip/no-ref/a/c
deleted file mode 100644
index f2ad6c7..0000000
--- a/tests/sources/zip/no-ref/a/c
+++ /dev/null
@@ -1 +0,0 @@
-c
diff --git a/tests/sources/zip/no-ref/target.bst b/tests/sources/zip/no-ref/target.bst
deleted file mode 100644
index 64a02a6..0000000
--- a/tests/sources/zip/no-ref/target.bst
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: autotools
-description: The kind of this element is irrelevant.
-sources:
-- kind: zip
- url: tmpdir:/a.zip
[buildstream] 04/04: plugins/sources/zip.py: Removing zip source
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch tristan/remove-sip-zource
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit bd2004e1674447ec655b9c4515ef0fa64d65d5c3
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Sat Mar 26 15:18:45 2022 +0900
plugins/sources/zip.py: Removing zip source
---
src/buildstream/plugins/sources/zip.py | 179 ---------------------------------
1 file changed, 179 deletions(-)
diff --git a/src/buildstream/plugins/sources/zip.py b/src/buildstream/plugins/sources/zip.py
deleted file mode 100644
index 4049485..0000000
--- a/src/buildstream/plugins/sources/zip.py
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# Copyright (C) 2017 Mathieu Bridon
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Authors:
-# Mathieu Bridon <bo...@daitauha.fr>
-
-"""
-zip - stage files from zip archives
-===================================
-
-**Usage:**
-
-.. code:: yaml
-
- # Specify the zip source kind
- kind: zip
-
- # Specify the zip url. Using an alias defined in your project
- # configuration is encouraged. 'bst source track' will update the
- # sha256sum in 'ref' to the downloaded file's sha256sum.
- url: upstream:foo.zip
-
- # Specify the ref. It's a sha256sum of the file you download.
- ref: 6c9f6f68a131ec6381da82f2bff978083ed7f4f7991d931bfa767b7965ebc94b
-
- # Specify a glob pattern to indicate the base directory to extract
- # from the archive. The first matching directory will be used.
- #
- # Note that this is '*' by default since most standard release
- # archives contain a self named subdirectory at the root which
- # contains the files one normally wants to extract to build.
- #
- # To extract the root of the archive directly, this can be set
- # to an empty string.
- base-dir: '*'
-
-See :ref:`built-in functionality doumentation <core_source_builtins>` for
-details on common configuration options for sources.
-
-.. attention::
-
- File permissions are not preserved. All extracted directories have
- permissions 0755 and all extracted files have permissions 0644.
-"""
-
-import os
-import zipfile
-import stat
-
-from buildstream import DownloadableFileSource, SourceError
-from buildstream import utils
-
-
-class ZipSource(DownloadableFileSource):
- # pylint: disable=attribute-defined-outside-init
-
- BST_MIN_VERSION = "2.0"
-
- def configure(self, node):
- super().configure(node)
-
- self.base_dir = node.get_str("base-dir", "*")
- node.validate_keys(DownloadableFileSource.COMMON_CONFIG_KEYS + ["base-dir"])
-
- def get_unique_key(self):
- return super().get_unique_key() + [self.base_dir]
-
- def stage(self, directory):
- exec_rights = (stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) & ~(stat.S_IWGRP | stat.S_IWOTH)
- noexec_rights = exec_rights & ~(stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
-
- try:
- with zipfile.ZipFile(self._get_mirror_file()) as archive:
- base_dir = None
- if self.base_dir:
- base_dir = self._find_base_dir(archive, self.base_dir)
-
- if base_dir:
- members = self._extract_members(archive, base_dir)
- else:
- members = archive.namelist()
-
- for member in members:
- written = archive.extract(member, path=directory)
-
- # zipfile.extract might create missing directories
- rel = os.path.relpath(written, start=directory)
- assert not os.path.isabs(rel)
- rel = os.path.dirname(rel)
- while rel:
- os.chmod(os.path.join(directory, rel), exec_rights)
- rel = os.path.dirname(rel)
-
- if os.path.islink(written):
- pass
- elif os.path.isdir(written):
- os.chmod(written, exec_rights)
- else:
- os.chmod(written, noexec_rights)
-
- except (zipfile.BadZipFile, zipfile.LargeZipFile, OSError) as e:
- raise SourceError("{}: Error staging source: {}".format(self, e)) from e
-
- # Override and translate which filenames to extract
- def _extract_members(self, archive, base_dir):
- if not base_dir.endswith(os.sep):
- base_dir = base_dir + os.sep
-
- L = len(base_dir)
- for member in archive.infolist():
- if member.filename == base_dir:
- continue
-
- if member.filename.startswith(base_dir):
- member.filename = member.filename[L:]
- yield member
-
- # We want to iterate over all paths of an archive, but namelist()
- # is not enough because some archives simply do not contain the leading
- # directory paths for the archived files.
- def _list_archive_paths(self, archive):
-
- visited = {}
- for member in archive.infolist():
-
- # ZipInfo.is_dir() is only available in python >= 3.6, but all
- # it does is check for a trailing '/' in the name
- #
- if not member.filename.endswith("/"):
-
- # Loop over the components of a path, for a path of a/b/c/d
- # we will first visit 'a', then 'a/b' and then 'a/b/c', excluding
- # the final component
- components = member.filename.split("/")
- for i in range(len(components) - 1):
- dir_component = "/".join([components[j] for j in range(i + 1)])
- if dir_component not in visited:
- visited[dir_component] = True
- try:
- # Dont yield directory members which actually do
- # exist in the archive
- _ = archive.getinfo(dir_component)
- except KeyError:
- if dir_component != ".":
- yield dir_component
-
- continue
-
- # Avoid considering the '.' directory, if any is included in the archive
- # this is to avoid the default 'base-dir: *' value behaving differently
- # depending on whether the archive was encoded with a leading '.' or not
- if member.filename == "." or member.filename == "./":
- continue
-
- yield member.filename
-
- def _find_base_dir(self, archive, pattern):
- paths = self._list_archive_paths(archive)
- matches = sorted(list(utils.glob(paths, pattern)))
- if not matches:
- raise SourceError("{}: Could not find base directory matching pattern: {}".format(self, pattern))
-
- return matches[0]
-
-
-def setup():
- return ZipSource
[buildstream] 03/04: tests/cachekey: Removing zip sources from the cache key tests
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch tristan/remove-sip-zource
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit bcdb88539a740e65d04789785acd627c3524f3ff
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Sat Mar 26 15:39:26 2022 +0900
tests/cachekey: Removing zip sources from the cache key tests
---
tests/cachekey/project/sources/zip1.bst | 5 -----
tests/cachekey/project/sources/zip1.expected | 1 -
tests/cachekey/project/sources/zip2.bst | 6 ------
tests/cachekey/project/sources/zip2.expected | 1 -
tests/cachekey/project/target.bst | 2 --
tests/cachekey/project/target.expected | 2 +-
6 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/tests/cachekey/project/sources/zip1.bst b/tests/cachekey/project/sources/zip1.bst
deleted file mode 100644
index a55eeb9..0000000
--- a/tests/cachekey/project/sources/zip1.bst
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: import
-sources:
-- kind: zip
- url: https://example.com/releases/1.4/foo-1.4.5.zip
- ref: 6c9f6f68a131ec6381da82f2bff978083ed7f4f7991d931bfa767b7965ebc94b
diff --git a/tests/cachekey/project/sources/zip1.expected b/tests/cachekey/project/sources/zip1.expected
deleted file mode 100644
index 20b78d7..0000000
--- a/tests/cachekey/project/sources/zip1.expected
+++ /dev/null
@@ -1 +0,0 @@
-db33f28fb82d6cf8f7e2a856ba55e9e8ec21b515f8aafc9ebcd448f44611d74d
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip2.bst b/tests/cachekey/project/sources/zip2.bst
deleted file mode 100644
index 1f3961a..0000000
--- a/tests/cachekey/project/sources/zip2.bst
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: import
-sources:
-- kind: zip
- url: https://example.com/releases/1.4/foo-1.4.5.zip
- ref: 6c9f6f68a131ec6381da82f2bff978083ed7f4f7991d931bfa767b7965ebc94b
- base-dir: src
diff --git a/tests/cachekey/project/sources/zip2.expected b/tests/cachekey/project/sources/zip2.expected
deleted file mode 100644
index b48cf36..0000000
--- a/tests/cachekey/project/sources/zip2.expected
+++ /dev/null
@@ -1 +0,0 @@
-5b067e82ffa03706fb9dd8248f02590086ff71c731d9c8d9d3d27363281b1e3c
\ No newline at end of file
diff --git a/tests/cachekey/project/target.bst b/tests/cachekey/project/target.bst
index 30f8660..8ec6284 100644
--- a/tests/cachekey/project/target.bst
+++ b/tests/cachekey/project/target.bst
@@ -18,8 +18,6 @@ depends:
- sources/remote2.bst
- sources/tar1.bst
- sources/tar2.bst
-- sources/zip1.bst
-- sources/zip2.bst
- elements/build1.bst
- elements/build2.bst
- elements/build3.bst
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index d7ff9a3..9734d67 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-1631a75b1f5a4648582a73a2786c7fc9e039eb4ed0159ea95c84560d586f7aa9
\ No newline at end of file
+f6351b90338635b277a832e8ceaa366ecdef231aae5d07c0da1cb01890837b97
\ No newline at end of file