GNOME.org
 

[Notes] [Git][BuildStream/buildstream][bschubert/add-fedora-nobwrap-tests] 2 commits: fixup! gitlab-ci.yml: Add linux without brwap/ostree to ensure tests behave

Title: GitLab

Benjamin Schubert pushed to branch bschubert/add-fedora-nobwrap-tests at BuildStream / buildstream

Commits:

5 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -83,7 +83,7 @@ source_dist:
    83 83 
       after_script:
    84 84 
       # Collect our reports
    85 85 
       - mkdir -p coverage-linux/
    86 
    -  - cp dist/buildstream/.coverage ${COVERAGE_LINUX}/coverage."${CI_JOB_NAME}"
    86 
    +  - cp dist/buildstream/.coverage ${COVERAGE_DIR}/coverage."${CI_JOB_NAME}"
    87 87 
       except:
    88 88 
       - schedules
    89 89 
       artifacts:

  • tests/integration/source-determinism.py
    ... ... @@ -4,6 +4,7 @@ import pytest
    4 4 
     from buildstream import _yaml, utils
    5 5 
     from tests.testutils import create_repo, ALL_REPO_KINDS
    6 6 
     from tests.testutils import cli_integration as cli
    7 
    +from tests.testutils.site import HAVE_BWRAP, IS_LINUX
    7 8
    8 9
    9 10 
     DATA_DIR = os.path.join(
    ... ... @@ -29,6 +30,7 @@ def create_test_directory(*path, mode=0o644):
    29 30 
     @pytest.mark.integration
    30 31 
     @pytest.mark.datafiles(DATA_DIR)
    31 32 
     @pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS] + ['local'])
    33 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    32 34 
     def test_deterministic_source_umask(cli, tmpdir, datafiles, kind, integration_cache):
    33 35 
         project = str(datafiles)
    34 36 
         element_name = 'list'
    ... ... @@ -101,6 +103,7 @@ def test_deterministic_source_umask(cli, tmpdir, datafiles, kind, integration_ca
    101 103
    102 104 
     @pytest.mark.integration
    103 105 
     @pytest.mark.datafiles(DATA_DIR)
    106 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    104 107 
     def test_deterministic_source_local(cli, tmpdir, datafiles, integration_cache):
    105 108 
         """Only user rights should be considered for local source.
    106 109 
         """

  • tests/integration/stack.py
    ... ... @@ -4,6 +4,7 @@ import pytest
    4 4 
     from buildstream import _yaml
    5 5
    6 6 
     from tests.testutils import cli_integration as cli
    7 
    +from tests.testutils.site import HAVE_BWRAP, IS_LINUX
    7 8
    8 9
    9 10 
     pytestmark = pytest.mark.integration
    ... ... @@ -16,6 +17,7 @@ DATA_DIR = os.path.join(
    16 17
    17 18
    18 19 
     @pytest.mark.datafiles(DATA_DIR)
    20 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    19 21 
     def test_stack(cli, tmpdir, datafiles):
    20 22 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    21 23 
         checkout = os.path.join(cli.directory, 'checkout')

  • tests/integration/symlinks.py
    ... ... @@ -6,6 +6,7 @@ from buildstream import _yaml
    6 6
    7 7 
     from tests.testutils import cli_integration as cli
    8 8 
     from tests.testutils.integration import assert_contains
    9 
    +from tests.testutils.site import HAVE_BWRAP, IS_LINUX
    9 10
    10 11
    11 12 
     pytestmark = pytest.mark.integration
    ... ... @@ -18,6 +19,7 @@ DATA_DIR = os.path.join(
    18 19
    19 20
    20 21 
     @pytest.mark.datafiles(DATA_DIR)
    22 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    21 23 
     def test_absolute_symlinks_made_relative(cli, tmpdir, datafiles):
    22 24 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    23 25 
         checkout = os.path.join(cli.directory, 'checkout')
    ... ... @@ -41,6 +43,7 @@ def test_absolute_symlinks_made_relative(cli, tmpdir, datafiles):
    41 43
    42 44
    43 45 
     @pytest.mark.datafiles(DATA_DIR)
    46 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    44 47 
     def test_allow_overlaps_inside_symlink_with_dangling_target(cli, tmpdir, datafiles):
    45 48 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    46 49 
         checkout = os.path.join(cli.directory, 'checkout')
    ... ... @@ -57,6 +60,7 @@ def test_allow_overlaps_inside_symlink_with_dangling_target(cli, tmpdir, datafil
    57 60
    58 61
    59 62 
     @pytest.mark.datafiles(DATA_DIR)
    63 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    60 64 
     def test_detect_symlink_overlaps_pointing_outside_sandbox(cli, tmpdir, datafiles):
    61 65 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    62 66 
         checkout = os.path.join(cli.directory, 'checkout')

  • tests/integration/workspace.py
    ... ... @@ -3,7 +3,7 @@ import pytest
    3 3
    4 4 
     from buildstream import _yaml
    5 5 
     from tests.testutils import cli_integration as cli
    6 
    -from tests.testutils.site import IS_LINUX
    6 
    +from tests.testutils.site import HAVE_BWRAP, IS_LINUX
    7 7 
     from tests.testutils.integration import walk_dir
    8 8
    9 9
    ... ... @@ -18,6 +18,7 @@ DATA_DIR = os.path.join(
    18 18
    19 19 
     @pytest.mark.integration
    20 20 
     @pytest.mark.datafiles(DATA_DIR)
    21 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    21 22 
     def test_workspace_mount(cli, tmpdir, datafiles):
    22 23 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    23 24 
         workspace = os.path.join(cli.directory, 'workspace')
    ... ... @@ -34,6 +35,7 @@ def test_workspace_mount(cli, tmpdir, datafiles):
    34 35
    35 36 
     @pytest.mark.integration
    36 37 
     @pytest.mark.datafiles(DATA_DIR)
    38 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    37 39 
     def test_workspace_commanddir(cli, tmpdir, datafiles):
    38 40 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    39 41 
         workspace = os.path.join(cli.directory, 'workspace')
    ... ... @@ -51,6 +53,7 @@ def test_workspace_commanddir(cli, tmpdir, datafiles):
    51 53
    52 54 
     @pytest.mark.integration
    53 55 
     @pytest.mark.datafiles(DATA_DIR)
    56 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    54 57 
     def test_workspace_updated_dependency(cli, tmpdir, datafiles):
    55 58 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    56 59 
         workspace = os.path.join(cli.directory, 'workspace')
    ... ... @@ -105,6 +108,7 @@ def test_workspace_updated_dependency(cli, tmpdir, datafiles):
    105 108
    106 109 
     @pytest.mark.integration
    107 110 
     @pytest.mark.datafiles(DATA_DIR)
    111 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    108 112 
     def test_workspace_update_dependency_failed(cli, tmpdir, datafiles):
    109 113 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    110 114 
         workspace = os.path.join(cli.directory, 'workspace')
    ... ... @@ -180,6 +184,7 @@ def test_workspace_update_dependency_failed(cli, tmpdir, datafiles):
    180 184
    181 185 
     @pytest.mark.integration
    182 186 
     @pytest.mark.datafiles(DATA_DIR)
    187 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    183 188 
     def test_updated_dependency_nested(cli, tmpdir, datafiles):
    184 189 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    185 190 
         workspace = os.path.join(cli.directory, 'workspace')
    ... ... @@ -233,6 +238,7 @@ def test_updated_dependency_nested(cli, tmpdir, datafiles):
    233 238
    234 239 
     @pytest.mark.integration
    235 240 
     @pytest.mark.datafiles(DATA_DIR)
    241 
    +@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
    236 242 
     def test_incremental_configure_commands_run_only_once(cli, tmpdir, datafiles):
    237 243 
         project = os.path.join(datafiles.dirname, datafiles.basename)
    238 244 
         workspace = os.path.join(cli.directory, 'workspace')

    • —
    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]