diff options
author | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-21 15:55:46 +0000 |
---|---|---|
committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-21 15:55:46 +0000 |
commit | 7b8c730e53326c89386ffc661a0200df2706e29f (patch) | |
tree | e98e085e4f0a9020725aa3a25df7809a96d807ba /tests/integration/compose-symlinks.py | |
parent | bc1b971e169f2fc721c61276c071640caee6a3f8 (diff) | |
parent | f2b15d86debd32241228f7b728016ed0057cd0d2 (diff) | |
download | buildstream-7b8c730e53326c89386ffc661a0200df2706e29f.tar.gz |
Merge branch 'aevri/dirname_basename' into 'master'
tests: str(datafiles) instead of a longer thing
See merge request BuildStream/buildstream!1245
Diffstat (limited to 'tests/integration/compose-symlinks.py')
-rw-r--r-- | tests/integration/compose-symlinks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/integration/compose-symlinks.py b/tests/integration/compose-symlinks.py index ee7689e6e..6f9e0ea7d 100644 --- a/tests/integration/compose-symlinks.py +++ b/tests/integration/compose-symlinks.py @@ -19,7 +19,7 @@ DATA_DIR = os.path.join( # noinspection PyUnusedLocal @pytest.mark.datafiles(DATA_DIR) def test_compose_symlinks(cli, tmpdir, datafiles): - project = os.path.join(datafiles.dirname, datafiles.basename) + project = str(datafiles) # Symlinks do not survive being placed in a source distribution # ('setup.py sdist'), so we have to create the one we need here. |