diff options
Diffstat (limited to 'src/buildstream/testing/_sourcetests/mirror.py')
| -rw-r--r-- | src/buildstream/testing/_sourcetests/mirror.py | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/buildstream/testing/_sourcetests/mirror.py b/src/buildstream/testing/_sourcetests/mirror.py index a28bf3c00..b907a6ee4 100644 --- a/src/buildstream/testing/_sourcetests/mirror.py +++ b/src/buildstream/testing/_sourcetests/mirror.py @@ -163,17 +163,11 @@ def test_mirror_from_includes(cli, tmpdir, datafiles, kind): config_project_dir = str(tmpdir.join("config")) os.makedirs(config_project_dir, exist_ok=True) config_project = {"name": "config"} - _yaml.roundtrip_dump( - config_project, os.path.join(config_project_dir, "project.conf") - ) - extra_mirrors = { - "mirrors": [{"name": "middle-earth", "aliases": {alias: [mirror_map + "/"],}}] - } + _yaml.roundtrip_dump(config_project, os.path.join(config_project_dir, "project.conf")) + extra_mirrors = {"mirrors": [{"name": "middle-earth", "aliases": {alias: [mirror_map + "/"],}}]} _yaml.roundtrip_dump(extra_mirrors, os.path.join(config_project_dir, "mirrors.yml")) generate_junction( - str(tmpdir.join("config_repo")), - config_project_dir, - os.path.join(element_dir, "config.bst"), + str(tmpdir.join("config_repo")), config_project_dir, os.path.join(element_dir, "config.bst"), ) _set_project_includes_and_aliases( @@ -217,22 +211,14 @@ def test_mirror_junction_from_includes(cli, tmpdir, datafiles, kind): config_project_dir = str(tmpdir.join("config")) os.makedirs(config_project_dir, exist_ok=True) config_project = {"name": "config"} - _yaml.roundtrip_dump( - config_project, os.path.join(config_project_dir, "project.conf") - ) - extra_mirrors = { - "mirrors": [{"name": "middle-earth", "aliases": {alias: [mirror_map + "/"],}}] - } + _yaml.roundtrip_dump(config_project, os.path.join(config_project_dir, "project.conf")) + extra_mirrors = {"mirrors": [{"name": "middle-earth", "aliases": {alias: [mirror_map + "/"],}}]} _yaml.roundtrip_dump(extra_mirrors, os.path.join(config_project_dir, "mirrors.yml")) generate_junction( - str(tmpdir.join("config_repo")), - config_project_dir, - os.path.join(element_dir, "config.bst"), + str(tmpdir.join("config_repo")), config_project_dir, os.path.join(element_dir, "config.bst"), ) - _set_project_includes_and_aliases( - project_dir, ["config.bst:mirrors.yml"], {alias: upstream_map + "/"} - ) + _set_project_includes_and_aliases(project_dir, ["config.bst:mirrors.yml"], {alias: upstream_map + "/"}) # Now make the upstream unavailable. os.rename(upstream_repo.repo, "{}.bak".format(upstream_repo.repo)) |