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/loader.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/loader.py')
| -rw-r--r-- | tests/internals/loader.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/internals/loader.py b/tests/internals/loader.py index 7663d03e3..006b5787f 100644 --- a/tests/internals/loader.py +++ b/tests/internals/loader.py @@ -31,7 +31,7 @@ def make_loader(basedir): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'onefile')) def test_one_file(datafiles): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) loader = make_loader(basedir) element = loader.load(['elements/onefile.bst'])[0] @@ -43,7 +43,7 @@ def test_one_file(datafiles): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'onefile')) def test_missing_file(datafiles): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) loader = make_loader(basedir) with pytest.raises(LoadError) as exc: @@ -55,7 +55,7 @@ def test_missing_file(datafiles): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'onefile')) def test_invalid_reference(datafiles): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) loader = make_loader(basedir) with pytest.raises(LoadError) as exc: @@ -67,7 +67,7 @@ def test_invalid_reference(datafiles): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'onefile')) def test_invalid_yaml(datafiles): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) loader = make_loader(basedir) with pytest.raises(LoadError) as exc: @@ -79,7 +79,7 @@ def test_invalid_yaml(datafiles): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'onefile')) def test_fail_fullpath_target(datafiles): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) fullpath = os.path.join(basedir, 'elements', 'onefile.bst') with pytest.raises(LoadError) as exc: @@ -92,7 +92,7 @@ def test_fail_fullpath_target(datafiles): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'onefile')) def test_invalid_key(datafiles): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) loader = make_loader(basedir) with pytest.raises(LoadError) as exc: @@ -104,7 +104,7 @@ def test_invalid_key(datafiles): @pytest.mark.datafiles(os.path.join(DATA_DIR, 'onefile')) def test_invalid_directory_load(datafiles): - basedir = os.path.join(datafiles.dirname, datafiles.basename) + basedir = str(datafiles) loader = make_loader(basedir) with pytest.raises(LoadError) as exc: |