summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2017-10-23 11:17:21 +0200
committerJürg Billeter <j@bitron.ch>2018-02-08 14:04:04 +0100
commit1d331b9b7db812e3f18c3eed33af92739c2ffb7b (patch)
treed40c49423bb7aa804f0993495330c632d46fa9ba /tests
parentb5f101a2ac19ff4e64de17a18230e351137c1884 (diff)
downloadbuildstream-1d331b9b7db812e3f18c3eed33af92739c2ffb7b.tar.gz
Move cli_options from Context to Project
cli_options are project-specific.
Diffstat (limited to 'tests')
-rw-r--r--tests/artifactcache/config.py2
-rw-r--r--tests/context/context.py2
-rw-r--r--tests/plugins/pipeline.py2
-rw-r--r--tests/project/plugins.py2
-rw-r--r--tests/project/project.py12
-rw-r--r--tests/variables/variables.py2
6 files changed, 11 insertions, 11 deletions
diff --git a/tests/artifactcache/config.py b/tests/artifactcache/config.py
index e734c2dbe..690e354f5 100644
--- a/tests/artifactcache/config.py
+++ b/tests/artifactcache/config.py
@@ -94,7 +94,7 @@ def test_artifact_cache_precedence(tmpdir, override_caches, project_caches, user
project_config_file = str(project_dir.join('project.conf'))
_yaml.dump(_yaml.node_sanitize(project_config), filename=project_config_file)
- context = Context([])
+ context = Context()
context.load(config=user_config_file)
project = Project(str(project_dir), context)
diff --git a/tests/context/context.py b/tests/context/context.py
index 442069bf6..a153d7f6d 100644
--- a/tests/context/context.py
+++ b/tests/context/context.py
@@ -20,7 +20,7 @@ def context_fixture():
return {
'xdg-cache': cache_home,
- 'context': Context([])
+ 'context': Context()
}
diff --git a/tests/plugins/pipeline.py b/tests/plugins/pipeline.py
index a77dcd1d2..805155731 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):
- context = Context([])
+ context = Context()
project = Project(basedir, context)
context.deploydir = os.path.join(str(tmpdir), 'deploy')
context.artifactdir = os.path.join(str(tmpdir), 'artifact')
diff --git a/tests/project/plugins.py b/tests/project/plugins.py
index 4040137c1..8907c7eaf 100644
--- a/tests/project/plugins.py
+++ b/tests/project/plugins.py
@@ -12,7 +12,7 @@ DATA_DIR = os.path.join(
def create_pipeline(tmpdir, basedir, target):
- context = Context([])
+ context = Context()
project = Project(basedir, context)
context.artifactdir = os.path.join(str(tmpdir), 'artifact')
diff --git a/tests/project/project.py b/tests/project/project.py
index 3a1484309..2505431d8 100644
--- a/tests/project/project.py
+++ b/tests/project/project.py
@@ -16,7 +16,7 @@ def test_missing_project_conf(datafiles):
directory = os.path.join(datafiles.dirname, datafiles.basename)
with pytest.raises(LoadError) as exc:
- project = Project(directory, Context([]))
+ project = Project(directory, Context())
assert (exc.value.reason == LoadErrorReason.MISSING_FILE)
@@ -26,7 +26,7 @@ def test_missing_project_name(datafiles):
directory = os.path.join(datafiles.dirname, datafiles.basename, "missingname")
with pytest.raises(LoadError) as exc:
- project = Project(directory, Context([]))
+ project = Project(directory, Context())
assert (exc.value.reason == LoadErrorReason.INVALID_DATA)
@@ -35,7 +35,7 @@ def test_missing_project_name(datafiles):
def test_load_basic_project(datafiles):
directory = os.path.join(datafiles.dirname, datafiles.basename, "basic")
- project = Project(directory, Context([]))
+ project = Project(directory, Context())
# User provided
assert (project.name == "pony")
@@ -50,7 +50,7 @@ def test_load_basic_project(datafiles):
def test_override_project_path(datafiles):
directory = os.path.join(datafiles.dirname, datafiles.basename, "overridepath")
- project = Project(directory, Context([]))
+ project = Project(directory, Context())
# Test the override
assert (project._environment['PATH'] == "/bin:/sbin")
@@ -60,7 +60,7 @@ def test_override_project_path(datafiles):
def test_project_alias(datafiles):
directory = os.path.join(datafiles.dirname, datafiles.basename, "alias")
- project = Project(directory, Context([]))
+ project = Project(directory, Context())
# Test the override
assert (project.translate_url('baserock:foo') == 'git://git.baserock.org/baserock/foo')
@@ -72,6 +72,6 @@ def test_project_unsupported(datafiles):
directory = os.path.join(datafiles.dirname, datafiles.basename, "unsupported")
with pytest.raises(LoadError) as exc:
- project = Project(directory, Context([]))
+ project = Project(directory, Context())
assert (exc.value.reason == LoadErrorReason.UNSUPPORTED_PROJECT)
diff --git a/tests/variables/variables.py b/tests/variables/variables.py
index 24f323c69..b16511ad6 100644
--- a/tests/variables/variables.py
+++ b/tests/variables/variables.py
@@ -12,7 +12,7 @@ DATA_DIR = os.path.join(
def create_pipeline(tmpdir, basedir, target):
- context = Context([])
+ context = Context()
project = Project(basedir, context)
context.artifactdir = os.path.join(str(tmpdir), 'artifact')