tests: move templated tests from source-determinism.py into separate file

Move the templated tests in tests/frontend/source-determinism.py into
sources/source_determinism.py

This is part of the preparation work for #944

3 files changed, 137 insertions, 74 deletions

diff --git a/tests/integration/source-determinism.py b/tests/integration/source-determinism.py
index 9fc153e1a..7cfca98e0 100644
--- a/tests/integration/source-determinism.py
+++ b/tests/integration/source-determinism.py
@@ -3,7 +3,7 @@ import pytest
 
 from buildstream import _yaml
 from buildstream.plugintestutils import cli_integration as cli
-from tests.testutils import create_repo, ALL_REPO_KINDS
+from tests.testutils import create_repo
 from tests.testutils.site import HAVE_SANDBOX
 
 
@@ -29,78 +29,6 @@ def create_test_directory(*path, mode=0o644):
 
 @pytest.mark.integration
 @pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.parametrize("kind", ['local', *ALL_REPO_KINDS])
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
-def test_deterministic_source_umask(cli, tmpdir, datafiles, kind):
-    project = str(datafiles)
-    element_name = 'list.bst'
-    element_path = os.path.join(project, 'elements', element_name)
-    repodir = os.path.join(str(tmpdir), 'repo')
-    sourcedir = os.path.join(project, 'source')
-
-    create_test_file(sourcedir, 'a.txt', mode=0o700)
-    create_test_file(sourcedir, 'b.txt', mode=0o755)
-    create_test_file(sourcedir, 'c.txt', mode=0o600)
-    create_test_file(sourcedir, 'd.txt', mode=0o400)
-    create_test_file(sourcedir, 'e.txt', mode=0o644)
-    create_test_file(sourcedir, 'f.txt', mode=0o4755)
-    create_test_file(sourcedir, 'g.txt', mode=0o2755)
-    create_test_file(sourcedir, 'h.txt', mode=0o1755)
-    create_test_directory(sourcedir, 'dir-a', mode=0o0700)
-    create_test_directory(sourcedir, 'dir-c', mode=0o0755)
-    create_test_directory(sourcedir, 'dir-d', mode=0o4755)
-    create_test_directory(sourcedir, 'dir-e', mode=0o2755)
-    create_test_directory(sourcedir, 'dir-f', mode=0o1755)
-
-    if kind == 'local':
-        source = {'kind': 'local',
-                  'path': 'source'}
-    else:
-        repo = create_repo(kind, repodir)
-        ref = repo.create(sourcedir)
-        source = repo.source_config(ref=ref)
-    element = {
-        'kind': 'manual',
-        'depends': [
-            {
-                'filename': 'base.bst',
-                'type': 'build'
-            }
-        ],
-        'sources': [
-            source
-        ],
-        'config': {
-            'install-commands': [
-                'ls -l >"%{install-root}/ls-l"'
-            ]
-        }
-    }
-    _yaml.dump(element, element_path)
-
-    def get_value_for_umask(umask):
-        checkoutdir = os.path.join(str(tmpdir), 'checkout-{}'.format(umask))
-
-        old_umask = os.umask(umask)
-
-        try:
-            result = cli.run(project=project, args=['build', element_name])
-            result.assert_success()
-
-            result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkoutdir])
-            result.assert_success()
-
-            with open(os.path.join(checkoutdir, 'ls-l'), 'r') as f:
-                return f.read()
-        finally:
-            os.umask(old_umask)
-            cli.remove_artifact_from_cache(project, element_name)
-
-    assert get_value_for_umask(0o022) == get_value_for_umask(0o077)
-
-
-@pytest.mark.integration
-@pytest.mark.datafiles(DATA_DIR)
 @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
 def test_deterministic_source_local(cli, tmpdir, datafiles):
     """Only user rights should be considered for local source.
diff --git a/tests/sources/generic/project/project.conf b/tests/sources/generic/project/project.conf
index ed18221e4..05b68bfeb 100644
--- a/tests/sources/generic/project/project.conf
+++ b/tests/sources/generic/project/project.conf
@@ -1,7 +1,26 @@
 # Project config for frontend build test
 name: test
-
 element-path: elements
+aliases:
+  alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
+  project_dir: file://{project_dir}
+options:
+  linux:
+    type: bool
+    description: Whether to expect a linux platform
+    default: True
+  arch:
+    type: arch
+    description: Current architecture
+    values:
+      - x86-64
+      - aarch64
+split-rules:
+  test:
+    - |
+      /tests
+    - |
+      /tests/*
 
 fatal-warnings:
 - bad-element-suffix
diff --git a/tests/sources/generic/source_determinism.py b/tests/sources/generic/source_determinism.py
new file mode 100644
index 000000000..98c4c9835
--- /dev/null
+++ b/tests/sources/generic/source_determinism.py
@@ -0,0 +1,116 @@
+#
+#  Copyright (C) 2018 Codethink Limited
+#  Copyright (C) 2019 Bloomberg Finance LP
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+import pytest
+
+from tests.testutils import create_repo, ALL_REPO_KINDS
+from tests.testutils.site import HAVE_SANDBOX
+
+from buildstream.plugintestutils import cli
+from buildstream import _yaml
+
+# Project directory
+TOP_DIR = os.path.dirname(os.path.realpath(__file__))
+DATA_DIR = os.path.join(TOP_DIR, 'project')
+
+
+def create_test_file(*path, mode=0o644, content='content\n'):
+    path = os.path.join(*path)
+    os.makedirs(os.path.dirname(path), exist_ok=True)
+    with open(path, 'w') as f:
+        f.write(content)
+        os.fchmod(f.fileno(), mode)
+
+
+def create_test_directory(*path, mode=0o644):
+    create_test_file(*path, '.keep', content='')
+    path = os.path.join(*path)
+    os.chmod(path, mode)
+
+
+@pytest.mark.integration
+@pytest.mark.datafiles(DATA_DIR)
+@pytest.mark.parametrize("kind", ['local', *ALL_REPO_KINDS])
+@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
+def test_deterministic_source_umask(cli, tmpdir, datafiles, kind):
+    project = str(datafiles)
+    element_name = 'list.bst'
+    element_path = os.path.join(project, 'elements', element_name)
+    repodir = os.path.join(str(tmpdir), 'repo')
+    sourcedir = os.path.join(project, 'source')
+
+    create_test_file(sourcedir, 'a.txt', mode=0o700)
+    create_test_file(sourcedir, 'b.txt', mode=0o755)
+    create_test_file(sourcedir, 'c.txt', mode=0o600)
+    create_test_file(sourcedir, 'd.txt', mode=0o400)
+    create_test_file(sourcedir, 'e.txt', mode=0o644)
+    create_test_file(sourcedir, 'f.txt', mode=0o4755)
+    create_test_file(sourcedir, 'g.txt', mode=0o2755)
+    create_test_file(sourcedir, 'h.txt', mode=0o1755)
+    create_test_directory(sourcedir, 'dir-a', mode=0o0700)
+    create_test_directory(sourcedir, 'dir-c', mode=0o0755)
+    create_test_directory(sourcedir, 'dir-d', mode=0o4755)
+    create_test_directory(sourcedir, 'dir-e', mode=0o2755)
+    create_test_directory(sourcedir, 'dir-f', mode=0o1755)
+
+    if kind == 'local':
+        source = {'kind': 'local',
+                  'path': 'source'}
+    else:
+        repo = create_repo(kind, repodir)
+        ref = repo.create(sourcedir)
+        source = repo.source_config(ref=ref)
+    element = {
+        'kind': 'manual',
+        'depends': [
+            {
+                'filename': 'base.bst',
+                'type': 'build'
+            }
+        ],
+        'sources': [
+            source
+        ],
+        'config': {
+            'install-commands': [
+                'ls -l >"%{install-root}/ls-l"'
+            ]
+        }
+    }
+    _yaml.dump(element, element_path)
+
+    def get_value_for_umask(umask):
+        checkoutdir = os.path.join(str(tmpdir), 'checkout-{}'.format(umask))
+
+        old_umask = os.umask(umask)
+
+        try:
+            result = cli.run(project=project, args=['build', element_name])
+            result.assert_success()
+
+            result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkoutdir])
+            result.assert_success()
+
+            with open(os.path.join(checkoutdir, 'ls-l'), 'r') as f:
+                return f.read()
+        finally:
+            os.umask(old_umask)
+            cli.remove_artifact_from_cache(project, element_name)
+
+    assert get_value_for_umask(0o022) == get_value_for_umask(0o077)