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/internals/pluginloading.py | |
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/internals/pluginloading.py')
-rw-r--r-- | tests/internals/pluginloading.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/internals/pluginloading.py b/tests/internals/pluginloading.py index 675ac8540..2d997077a 100644 --- a/tests/internals/pluginloading.py +++ b/tests/internals/pluginloading.py @@ -32,7 +32,7 @@ def create_pipeline(tmpdir, basedir, target): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'customsource')) def test_customsource(datafiles, tmpdir): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) targets = create_pipeline(tmpdir, basedir, 'simple.bst') assert targets[0].get_kind() == "autotools" @@ -40,14 +40,14 @@ def test_customsource(datafiles, tmpdir): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'customelement')) def test_customelement(datafiles, tmpdir): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) targets = create_pipeline(tmpdir, basedir, 'simple.bst') assert targets[0].get_kind() == "foo" @pytest.mark.datafiles(os.path.join(DATA_DIR, 'badversionsource')) def test_badversionsource(datafiles, tmpdir): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) with pytest.raises(LoadError) as exc: create_pipeline(tmpdir, basedir, 'simple.bst') @@ -57,7 +57,7 @@ def test_badversionsource(datafiles, tmpdir): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'badversionelement')) def test_badversionelement(datafiles, tmpdir): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) with pytest.raises(LoadError) as exc: create_pipeline(tmpdir, basedir, 'simple.bst') |