summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schubert <ben.c.schubert@gmail.com>2019-03-10 16:39:15 +0000
committerBenjamin Schubert <ben.c.schubert@gmail.com>2019-03-20 09:38:42 +0000
commit2cb9d2aa3eb15e2194e0c41270dd933f0bd13028 (patch)
tree27aa5a7a076fe5db7b06b13a8da05e10068b0f2b
parent8bfac470a3989f8dd77b3bb8b055ad15cb1c479a (diff)
downloadbuildstream-2cb9d2aa3eb15e2194e0c41270dd933f0bd13028.tar.gz
tests:lint: fix all blacklisted-name errors
-rw-r--r--tests/format/junctions.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/format/junctions.py b/tests/format/junctions.py
index 671cac15f..52c76e0f3 100644
--- a/tests/format/junctions.py
+++ b/tests/format/junctions.py
@@ -142,8 +142,8 @@ def test_missing_junction_in_subproject(cli, datafiles):
@pytest.mark.datafiles(DATA_DIR)
def test_nested_simple(cli, tmpdir, datafiles):
- foo = os.path.join(str(datafiles), 'foo')
- copy_subprojects(foo, datafiles, ['base'])
+ project = os.path.join(str(datafiles), 'foo')
+ copy_subprojects(project, datafiles, ['base'])
project = os.path.join(str(datafiles), 'nested')
copy_subprojects(project, datafiles, ['foo'])
@@ -163,11 +163,11 @@ def test_nested_simple(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
def test_nested_double(cli, tmpdir, datafiles):
- foo = os.path.join(str(datafiles), 'foo')
- copy_subprojects(foo, datafiles, ['base'])
+ project_foo = os.path.join(str(datafiles), 'foo')
+ copy_subprojects(project_foo, datafiles, ['base'])
- bar = os.path.join(str(datafiles), 'bar')
- copy_subprojects(bar, datafiles, ['base'])
+ project_bar = os.path.join(str(datafiles), 'bar')
+ copy_subprojects(project_bar, datafiles, ['base'])
project = os.path.join(str(datafiles), 'toplevel')
copy_subprojects(project, datafiles, ['base', 'foo', 'bar'])
@@ -188,11 +188,11 @@ def test_nested_double(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
def test_nested_conflict(cli, datafiles):
- foo = os.path.join(str(datafiles), 'foo')
- copy_subprojects(foo, datafiles, ['base'])
+ project_foo = os.path.join(str(datafiles), 'foo')
+ copy_subprojects(project_foo, datafiles, ['base'])
- bar = os.path.join(str(datafiles), 'bar')
- copy_subprojects(bar, datafiles, ['base'])
+ project_bar = os.path.join(str(datafiles), 'bar')
+ copy_subprojects(project_bar, datafiles, ['base'])
project = os.path.join(str(datafiles), 'conflict')
copy_subprojects(project, datafiles, ['foo', 'bar'])