diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-09-22 12:16:45 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-10-08 17:03:36 +0900 |
| commit | bc8a2ebb3b0d8e0f535b2956b9c6a3ad0a05fcef (patch) | |
| tree | 3539adb821e527613bb13bc4242ae0b6c1665532 /tests/plugins | |
| parent | e1df2e2d0a33667993c9800ca567b755037704a0 (diff) | |
| download | buildstream-bc8a2ebb3b0d8e0f535b2956b9c6a3ad0a05fcef.tar.gz | |
Updating test cases to construct the project/loader properly again.
This had changed when we added project variants and had to split
up the loading steps a bit, now all is back to normal without variants.
Diffstat (limited to 'tests/plugins')
| -rw-r--r-- | tests/plugins/pipeline.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/plugins/pipeline.py b/tests/plugins/pipeline.py index e44af789c..c8dcb32f8 100644 --- a/tests/plugins/pipeline.py +++ b/tests/plugins/pipeline.py @@ -13,7 +13,7 @@ DATA_DIR = os.path.join( ) -def create_pipeline(tmpdir, basedir, target, variant): +def create_pipeline(tmpdir, basedir, target): context = Context('x86_64') project = Project(basedir, 'x86_64') @@ -21,7 +21,7 @@ def create_pipeline(tmpdir, basedir, target, variant): context.artifactdir = os.path.join(str(tmpdir), 'artifact') context._platform = Platform.get_platform(context, project) - return Pipeline(context, project, target, variant) + return Pipeline(context, project, target) @pytest.mark.skipif(not HAVE_ROOT, reason="requires root permissions") @@ -29,7 +29,7 @@ def create_pipeline(tmpdir, basedir, target, variant): def test_customsource(datafiles, tmpdir): basedir = os.path.join(datafiles.dirname, datafiles.basename) - pipeline = create_pipeline(tmpdir, basedir, 'simple.bst', None) + pipeline = create_pipeline(tmpdir, basedir, 'simple.bst') assert(pipeline.target.get_kind() == "autotools") @@ -38,7 +38,7 @@ def test_customsource(datafiles, tmpdir): def test_customelement(datafiles, tmpdir): basedir = os.path.join(datafiles.dirname, datafiles.basename) - pipeline = create_pipeline(tmpdir, basedir, 'simple.bst', None) + pipeline = create_pipeline(tmpdir, basedir, 'simple.bst') assert(pipeline.target.get_kind() == "foo") @@ -48,7 +48,7 @@ def test_badversionsource(datafiles, tmpdir): basedir = os.path.join(datafiles.dirname, datafiles.basename) with pytest.raises(PluginError) as exc: - pipeline = create_pipeline(tmpdir, basedir, 'simple.bst', None) + pipeline = create_pipeline(tmpdir, basedir, 'simple.bst') @pytest.mark.skipif(not HAVE_ROOT, reason="requires root permissions") @@ -57,4 +57,4 @@ def test_badversionelement(datafiles, tmpdir): basedir = os.path.join(datafiles.dirname, datafiles.basename) with pytest.raises(PluginError) as exc: - pipeline = create_pipeline(tmpdir, basedir, 'simple.bst', None) + pipeline = create_pipeline(tmpdir, basedir, 'simple.bst') |