diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-04-25 23:21:37 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-04-25 23:26:42 +0900 |
| commit | 719a3fc3ee15513a790290d009ace5d3ec7bcd17 (patch) | |
| tree | 0c1d4348af02d376e53eab02618b25783198cff7 /tests | |
| parent | 7caecc685232a11d69f133858194d806531084a9 (diff) | |
| download | buildstream-719a3fc3ee15513a790290d009ace5d3ec7bcd17.tar.gz | |
Load and save junctioned source refs from/to junction.refs
o _projectrefs.py: Additional constructor option to choose the base name
o _project.py: Load two ProjectRefs objects, one for the junctions
o source.py: Load and save junctioned source refs with the appropriate ProjectRefs object
o tests: Updated some tests to expect junctions to be stored in junction.refs
This fixes issue #361
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/frontend/buildcheckout.py | 2 | ||||
| -rw-r--r-- | tests/frontend/fetch.py | 2 | ||||
| -rw-r--r-- | tests/frontend/show.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/frontend/buildcheckout.py b/tests/frontend/buildcheckout.py index ba56fc00c..45ef33bae 100644 --- a/tests/frontend/buildcheckout.py +++ b/tests/frontend/buildcheckout.py @@ -272,7 +272,7 @@ def test_unfetched_junction(cli, tmpdir, datafiles, ref_storage): } } } - _yaml.dump(project_refs, os.path.join(project, 'project.refs')) + _yaml.dump(project_refs, os.path.join(project, 'junction.refs')) # Now try to build it, this should automatically result in fetching # the junction itself at load time. diff --git a/tests/frontend/fetch.py b/tests/frontend/fetch.py index 261e0b22e..e074dadae 100644 --- a/tests/frontend/fetch.py +++ b/tests/frontend/fetch.py @@ -117,7 +117,7 @@ def test_unfetched_junction(cli, tmpdir, datafiles, ref_storage): } } } - _yaml.dump(project_refs, os.path.join(project, 'project.refs')) + _yaml.dump(project_refs, os.path.join(project, 'junction.refs')) # Now try to fetch it, this should automatically result in fetching # the junction itself. diff --git a/tests/frontend/show.py b/tests/frontend/show.py index f515fc44d..719dadbf4 100644 --- a/tests/frontend/show.py +++ b/tests/frontend/show.py @@ -151,7 +151,7 @@ def test_unfetched_junction(cli, tmpdir, datafiles, ref_storage): } } } - _yaml.dump(project_refs, os.path.join(project, 'project.refs')) + _yaml.dump(project_refs, os.path.join(project, 'junction.refs')) # Assert the correct error when trying to show the pipeline result = cli.run(project=project, silent=True, args=[ |