summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos Evripiotis <jevripiotis@bloomberg.net>2019-02-06 09:48:18 +0000
committerJürg Billeter <j@bitron.ch>2019-02-11 09:24:48 +0000
commitadde0c94bb56d75bac961e3b1fe6f2539b7780f6 (patch)
tree5e9de61ec46716b24d341d5a986c30586e0a21a7
parent3f6c50005bf5648e808e811f6c29a8debc2099d2 (diff)
downloadbuildstream-adde0c94bb56d75bac961e3b1fe6f2539b7780f6.tar.gz
tests/format/include: remove unused tmpdir'saevri/include-error
Don't create and remove temp dirs unnecessarily when they are not used, looks like these were just copy-pastes without intended side-effects.
-rw-r--r--tests/format/include.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/format/include.py b/tests/format/include.py
index 95b78d96e..83e19ad28 100644
--- a/tests/format/include.py
+++ b/tests/format/include.py
@@ -88,7 +88,7 @@ def test_include_junction_file(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
-def test_include_junction_options(cli, tmpdir, datafiles):
+def test_include_junction_options(cli, datafiles):
project = os.path.join(str(datafiles), 'options')
result = cli.run(project=project, args=[
@@ -169,7 +169,7 @@ def test_junction_element_not_partial_project_file(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
-def test_include_element_overrides(cli, tmpdir, datafiles):
+def test_include_element_overrides(cli, datafiles):
project = os.path.join(str(datafiles), 'overrides')
result = cli.run(project=project, args=[
@@ -184,7 +184,7 @@ def test_include_element_overrides(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
-def test_include_element_overrides_composition(cli, tmpdir, datafiles):
+def test_include_element_overrides_composition(cli, datafiles):
project = os.path.join(str(datafiles), 'overrides')
result = cli.run(project=project, args=[
@@ -199,7 +199,7 @@ def test_include_element_overrides_composition(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
-def test_include_element_overrides_sub_include(cli, tmpdir, datafiles):
+def test_include_element_overrides_sub_include(cli, datafiles):
project = os.path.join(str(datafiles), 'sub-include')
result = cli.run(project=project, args=[
@@ -233,7 +233,7 @@ def test_junction_do_not_use_included_overrides(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
-def test_conditional_in_fragment(cli, tmpdir, datafiles):
+def test_conditional_in_fragment(cli, datafiles):
project = os.path.join(str(datafiles), 'conditional')
result = cli.run(project=project, args=[
@@ -263,7 +263,7 @@ def test_inner(cli, datafiles):
@pytest.mark.datafiles(DATA_DIR)
-def test_recursive_include(cli, tmpdir, datafiles):
+def test_recursive_include(cli, datafiles):
project = os.path.join(str(datafiles), 'recursive')
result = cli.run(project=project, args=[