diff options
| author | Tristan Maat <tristan.maat@codethink.co.uk> | 2017-11-07 18:07:20 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-11-18 18:57:43 +0900 |
| commit | 486372e9d79641412214f2079112b5200bbc82d5 (patch) | |
| tree | 0c6a7f4677506993fd4e638ba19691305717187e /tests | |
| parent | 29bf7dc6862c4108a57eeec876cd57fac41d76e9 (diff) | |
| download | buildstream-486372e9d79641412214f2079112b5200bbc82d5.tar.gz | |
Fix tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pipeline/load.py | 11 | ||||
| -rw-r--r-- | tests/plugins/pipeline.py | 2 | ||||
| -rw-r--r-- | tests/project/plugins.py | 2 | ||||
| -rw-r--r-- | tests/variables/variables.py | 2 |
4 files changed, 3 insertions, 14 deletions
diff --git a/tests/pipeline/load.py b/tests/pipeline/load.py index 9cd2fea62..eeeeb1dc5 100644 --- a/tests/pipeline/load.py +++ b/tests/pipeline/load.py @@ -14,17 +14,6 @@ DATA_DIR = os.path.join( ) -def create_pipeline(tmpdir, basedir, target): - context = Context([]) - project = Project(basedir, context) - - context.deploydir = os.path.join(str(tmpdir), 'deploy') - context.artifactdir = os.path.join(str(tmpdir), 'artifact') - context._platform = Platform.get_platform() - - return Pipeline(context, project, [target]) - - @pytest.mark.datafiles(os.path.join(DATA_DIR, 'simple')) def test_load_simple(cli, datafiles, tmpdir): basedir = os.path.join(datafiles.dirname, datafiles.basename) diff --git a/tests/plugins/pipeline.py b/tests/plugins/pipeline.py index 5f1a85e24..8f8525318 100644 --- a/tests/plugins/pipeline.py +++ b/tests/plugins/pipeline.py @@ -24,7 +24,7 @@ def create_pipeline(tmpdir, basedir, target): context.artifactdir = os.path.join(str(tmpdir), 'artifact') context._platform = Platform.get_platform() - return Pipeline(context, project, [target]) + return Pipeline(context, project, [target], []) @pytest.mark.skipif(not HAVE_ROOT, reason="requires root permissions") diff --git a/tests/project/plugins.py b/tests/project/plugins.py index 5f7517278..ea21730b6 100644 --- a/tests/project/plugins.py +++ b/tests/project/plugins.py @@ -21,7 +21,7 @@ def create_pipeline(tmpdir, basedir, target): context.artifactdir = os.path.join(str(tmpdir), 'artifact') context._platform = Platform.get_platform() - return Pipeline(context, project, [target]) + return Pipeline(context, project, [target], []) # We've already validated that the plugin system works in diff --git a/tests/variables/variables.py b/tests/variables/variables.py index 0352ecd27..954298286 100644 --- a/tests/variables/variables.py +++ b/tests/variables/variables.py @@ -20,7 +20,7 @@ def create_pipeline(tmpdir, basedir, target): context.artifactdir = os.path.join(str(tmpdir), 'artifact') context._platform = Platform.get_platform() - return Pipeline(context, project, [target]) + return Pipeline(context, project, [target], []) def assert_command(datafiles, tmpdir, target, command, expected): |