diff options
| author | Angelos Evripiotis <jevripiotis@bloomberg.net> | 2019-03-20 11:06:42 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-21 14:57:31 +0000 |
| commit | f2b15d86debd32241228f7b728016ed0057cd0d2 (patch) | |
| tree | e98e085e4f0a9020725aa3a25df7809a96d807ba /tests/plugins | |
| parent | bc1b971e169f2fc721c61276c071640caee6a3f8 (diff) | |
| download | buildstream-f2b15d86debd32241228f7b728016ed0057cd0d2.tar.gz | |
tests: str(datafiles) instead of a longer thing
Replace some popular copypasta.
This important-looking invocation:
os.path.join(datafiles.dirname, datafiles.basename)
is equivalent to this shorter invocation:
project = str(datafiles)
It seems like it's very popular copypasta, replace it with the shorter
one thus:
# Use 'gsed' or 'sed' etc. as appropriate for your system.
git config --global alias.sub '!f() { git grep --name-only --null "$1" | gxargs --null gsed --in-place --expression "s/$1/$2/g" ; }; f'
git sub 'os.path.join(datafiles.dirname, datafiles.basename)' 'str(datafiles)'
Diffstat (limited to 'tests/plugins')
| -rw-r--r-- | tests/plugins/deprecationwarnings/deprecationwarnings.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/plugins/deprecationwarnings/deprecationwarnings.py b/tests/plugins/deprecationwarnings/deprecationwarnings.py index 10b93cc7a..0f61ce271 100644 --- a/tests/plugins/deprecationwarnings/deprecationwarnings.py +++ b/tests/plugins/deprecationwarnings/deprecationwarnings.py @@ -14,7 +14,7 @@ _DEPRECATION_WARNING = "Using deprecated plugin deprecated_plugin: {}".format(_D @pytest.mark.datafiles(DATA_DIR) def test_deprecation_warning_present(cli, datafiles): - project = os.path.join(datafiles.dirname, datafiles.basename) + project = str(datafiles) result = cli.run(project=project, args=['show', 'deprecated.bst']) result.assert_success() assert _DEPRECATION_WARNING in result.stderr @@ -22,7 +22,7 @@ def test_deprecation_warning_present(cli, datafiles): @pytest.mark.datafiles(DATA_DIR) def test_suppress_deprecation_warning(cli, datafiles): - project = os.path.join(datafiles.dirname, datafiles.basename) + project = str(datafiles) cli.run(project=project, args=['show', 'manual.bst']) element_overrides = "elements:\n" \ |