diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2018-08-30 07:07:48 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2018-08-30 07:07:48 +0000 |
| commit | 355f920869501dfb3d9c2271eddb701d1c80655c (patch) | |
| tree | 2d245321a94ffa35752eda67fc1c1fcc07edbe6c | |
| parent | 9aeed43c44b2c133666e0be6ccbbcd36e287363f (diff) | |
| parent | cd608e28cb7d44aaeeb97f1cf165d527dae0df46 (diff) | |
| download | buildstream-355f920869501dfb3d9c2271eddb701d1c80655c.tar.gz | |
Merge branch 'tristan/538-reenable-ostree-test-1.2' into 'bst-1.2'
tests/frontend/mirror.py: Reenable test_mirror_fetch_upstream_absent[ostree]
See merge request BuildStream/buildstream!756
| -rw-r--r-- | tests/frontend/mirror.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/frontend/mirror.py b/tests/frontend/mirror.py index f6031cad8..a5a80f0b9 100644 --- a/tests/frontend/mirror.py +++ b/tests/frontend/mirror.py @@ -142,10 +142,6 @@ def test_mirror_fetch(cli, tmpdir, datafiles, kind): @pytest.mark.datafiles(DATA_DIR) @pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS]) def test_mirror_fetch_upstream_absent(cli, tmpdir, datafiles, kind): - if kind == 'ostree': - # FIXME: Mirroring fallback fails with ostree - pytest.skip("Bug #538 - ostree mirror fallback breaks assertion") - bin_files_path = os.path.join(str(datafiles), 'files', 'bin-files', 'usr') dev_files_path = os.path.join(str(datafiles), 'files', 'dev-files', 'usr') upstream_repodir = os.path.join(str(tmpdir), 'upstream') |